I guess there's no way around it, but using internal classes is a liability: new versions might break us even in minor upgrades. It would be good to document all the internals we're using, and check on the wtp-dev@ mailing list if there's another way.