Quick & dirty hack for template arguments in 2.063.2

This covers up the bug I just reported. You might want to handle it a bit more elegantly though...