Moar code cleanups.