The new location seems like a better fit. The iterator typedefs are removed in favour of using C++11 auto.