Remove a few VS2010 workarounds

VS2010 has problems with range-based for loops and with constructing a map item
that contained uncopyable types