Completely refactor parsing for reliability (incl. exception-obscuring fix), increased composibility
Merge branch 'hotfix' (refactor parsing)