Version agnostic locators

nit: _branch and branch (and version_guid and _version_guid) are too alike when scanning the code. I'd personally prefer something like _branch_default and _version_guid_default.