remove a few things from requiring global scope

... at the cost of a few servicelocator calls.