PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
The old parser doesn't do anything with the dangling blocks. Just warns.