Fix bug in variable rewriting.
Remove parenthesis from builtin routines.