ok, understood you now. Good point about OSGi, in fact I expect this code will probably change when we'll look at that.

Sending a PR for master in a minute.