Fixing shadowed template arguments