resolve_rev: factor into a new utility function