Version agnostic locators

Seems obvious in hindsight...