Version agnostic locators

Fair point. I think `_hidden_branch` and `_hidden_version_guid` would be more accurate names, though.