Extract a bit of duplicated code
Remove obsolete save-window-excursion