Various stylistic changes.