Version agnostic locators

I was, yes. Where were we keeping them separate?