Remove typename from code which was formerly templated but isn't any longer.