A bit more cleanup.