Improve payload marker routines, commands.