Clone polishing

Further polishing of the OpenJDK clone behavior.