Ooops. I pulled in the commits from your work that made next_marker
available, but didn't fully implement using it.

Fixed in 50eb4d8a0e3a2ddfb79d833592f032ec359fed1b.