Nope @Sanne you are right, the whole _ServiceWrapper_ stuff is pretty much unchanged. It used to be _ServiceProviderWrapper_, but the whole virtual business and the counter thingy is all unchanged. 

As I pointed out to @gunnarmorling, I am not sure whether this is all still needed, but that is really a different story.