Various changes to improve output, based on manipulating expression tree