More work going into expression parsing