More fixes to expression parsing.
Try a two stage parser.