PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
Yeah, did that in my current local stash today morning. Waiting for review on this before I push that.