WIP: rejiggering a bunch of stuff to use Located (currently broken)

Most of these changes involve making the code shorter, which is a good
sign. =)