Simpler expression printing
Merge pull request #5879 from Calder/deparse3

Simpler expression printing