Clean up the output of ExpressionPrintVisitor