adapt to new redundant-reborrow rule