Mapping constructor cleanups