Final changes in Java Core files.