Miscellaneous style fixes.