Version agnostic locators

You're equating version_agnostic w/ branch_agnostic? We were treating those as separate before.