Various stylistic improvements.