Sooner or later, I will get to the bottom of this mass of C++ changes that need to be ported to Java. Sooner would definitely be better than later...
