A bit of source clean-up.