Improve Expression.toString

Related to #638