Avoid unnecessary semicolons

Spotted by Thierry Vignaud.
Simplify an expression
Add optional semicolon