Tweaks to java.make.