Merge "Support unnecessary parentheses"