Bugfixes cleanups

I don't think adding the braces here is an improvement, as it suggests you might reasonably have both lines uncommented. Better to add a comment explaining the alternative, or change the second statement to a comment.