Migrate to templated interface with templates being separate instances.