More minor stylistic changes.