ListServices should now always conceptually return objects of type Entry<Foo, Bar>.