Add 2-fold/3-fold repetition fix.
bench: 7972140