j2objc: style nits

Style nits. This PR is largely a test to see if the merge conflict is occuring everywhere.