Some cleanup.

Several cosmetic changes made to the code. No functionality compared to
the previous commit was added/removed/improved.