More tidying up of Builder refactor