Remove references to 'typename' outside of templates