A few more style refinements.