Prepare for next iteration.
set-overlays appeared twice.
Use with-current-buffer

Replaces save-excursion, set-buffer combination which produces a byte
compile warning now.