Actually, if we move to `builder` then it should be `doctrine.builder.` which clearly separates it from all the 'factory' nomenclature in ServiceManager. A good thing.