And fix parens-related test failures this found. Co-authored-by: Richard Si <63936253+ichard26@users.noreply.github.com>