Drop the dependency on LocalCollection in a couple of places.