greatly simplifying the renaming and reference mapping in AGREE