Simplify the whole wait_for_marker commit.

Companion commit to the same stuff in base ;).