OK. I'm content to ditch+document the "next" option. If someone wants it back, they can file a new PR with a unit-test. :)