Use deparse() to cast calls to string when needed

Use deparse() to cast calls to string when needed #636