suggested changes to branch eligible_ref_types_and_followups earlier commit