Fixed the Java renderer. Roundtrip tests pass!