As it turns out, we don't need a fully generic mapping copy ctor, we just need

something that maps through a std::map.  Since this simplified the client and
implementation code, do so now.

llvm-svn: 4250