hmpf, and another refactoring commit, thanks to git