fixes to recent Mapping<> TRAITs template changes - due to gcc's stricter rules for templates/scopes