simplify internal locations API

Created by: sqs

See commits. This just cleans up some code that I had written a while back and adds some tests.

Prereq for #1697