A bit more cleanup in here.