If you feel like it, this could be a good time to remove some ugliness from the past (I.e. this code).