Fix incorrect processing of self axis step

1. inside enclosed expression
2. in return clause of let expression

See the two supplied test cases.