Mapping template comments; and simplify MappingTraitsType change