fixed problems due to incomplete refactoring, removed unnecessary/unused transient parser context storage