Fixes a buildbot failure (was using local
type in template instantiation).