Revamp the wait for marker stuff.

Shuffle the logic around, and make it smarter.
Relies on the relevant changes in koreader.