Fix some assumptions about payload content.