MSVC fix; the base class typedef shadowed the local template parameter.