Continue the OCaml TLS merge

This follows up #23