more work on expression parsing