some updates to expression parsing.