avoid explicit reborrow in heir_swap