All Mixed Up

[billroper]

The problem with trying to maintain two different codebases, one in C++, the other in Java, both of which do things in slightly different ways, is that keeping them in sync is a pain. And error prone.

Having found several errors, I think I'll go be prone now.