Even more general stylistic improvements.