Changes to cleanup WebCL.