Make marker-resetting more robust.