Ensure nested CPR does not break havoc with repeat

...not that we do have nested CPR right now, but when we do, this should
better not break.