Better support for OCL.