REF: Move Loc-only methods to Loc
looks good, straight moves? > straight moves?

in a couple of places i got rid of `o = self.obj` and substituted in `self.obj` rebased+green gentle ping; merge conflicts are going to pile up yep, can you rebase; merge on green.