Simplified expression printing
Merge pull request #5871 from Calder/deparse

Simplified expression printing