- improve argument name
- remove debugging output
- update parse context
- extend regression test