Resolve subtle lint issues

The body of `if` statements should be surrounded with braces.  Now the
lint check doesn't stop the build process from executing the tests.

Also, while using `return` to stop `if` execution results in less code,
I side with the team that favors explicitly using `else` statements.