More thrashing about reworking parser and parser pump