Moar code cleanup.