Merge "Fix more [UnnecessaryParentheses] warnings"