WIP merge locators locations

@cpennington @flowerhack - this is still failing a number of tests. I am working on this now.
Maybe we should refer to this as the "deprecated" mechanism rather than "temporary", since I'm not sure we'll be fully getting rid of deprecated_string-ish calls anytime soon?