More cleanup after the core meltdown in #126