Fix type mappings; namespace changes in recent Doctrine library changes.