Use token strings now for template param in newExpr
Workaround hack for to-string on regex match hanging
Check tests still work