track the const vars
rlhc: various OCaml improvements