Fix the cruft produced from the refactoring

.. in 330404da07859f5dc2e2263da719ad4161f17d99