Update extra166y code in line with the JSR166 mainline.