@paulp Any new ideas on what's your preferred way to go forward with this? (Oracle's inability to ship code bought us some time, but it would still be nice to have this fixed in all supported versions before Java 8 is released.)