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