minor improvements to parse-expression