Fix expression parsing, closes #255