More minor style tweaks.