Use typedefs instead of std::container<Foo> in more places.