Merge "Fix parentheses, tidy code."