Validation -- changes for large object passed by value

 found by clang static analyzer cms.ArgSizeChecker

std::map
std::vector