Style fixups.