Fix some issues with expression parsing