minor cleanups and fixes to Mapping_Array<> - and fixed one calse of TRAITS usage