Progress on adding support for CilRet.