Java bindings improvements for CASCADE, minor cleanup.