[FOLD] Minimize likelihood of rotate-delete delays, code review cleanups