improve count support in excursion-mode