Fixes #7661

Adds missing parens around arithmetic expressions.