Make the Java output consisten with that of other language versions.