Minor Mapping<> cleanups