* implemented stream-name-is-path at parser and expander
* saving state