So at least one of my devtuils needed fixing up after the last refactor, and a bit of tidying up too while I was in there.