Small cleanup in Doctrine namespace