Merge "Tidy MethodProtoHelper."