Follow OCaml trunk (match with exception).