Streamline some boolean logic.
Add missing semicolons.