Remove uses of uri_or_object that are really just objects.