Internal refactor: have "nested" parsers not consume their end token. …
This simplifies the code by having less special cases.