Right, that's another "too many changes in one pull request".  The tests all pass though :)