Initial try at forcing template resolution
Fixing many nested typename specifiers