Rationalized payload header handling suggestions (I think)