WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Should we enforce that we only do this substitution (here and in other `clean` methods) if this is a deprecated Locator? I know that with the new-style, right now, this substitution wouldn't change anything. Just trying to think though future situations.