Switch to using plain `if/else` statements when there's no assignment.

The minifier outputs the same code anyway, and this has better readability.
Minor style tweaks.
Fix failing tests.
Run `grunt`.