Tidy up loose ends on Builder refactoring