PayloadParser refactor

Need to refactor a few more tests. Otherwise, this is done.
Please add `// WARN: xxxx` so we can find these in our humble i18n attempts