Style cleanups and such.