A few cosmetic changes found while making the previous commit.