CP-5715: Replace all occurrences of 'or' with '||' to work with OCaml 4.01.0