C++ PR13 templated vector fix