added more support to expression toStrings