Merge "Fix whitespace issues around parentheses"