Style cleanups and dead code elimination.