reformatting in ExpressionParser

trying to bring the level of hair-raising-ness down from 11
to say 10.8 or so