Oops, some Java-friendliness got left behind