Removed name shadowing in case statement.
Fixed parsing AbbreviatedPathExpression and PathExpression.