sometimes use List.*_opt instead of functions raising Not_found

sometimes use List.*_opt instead of functions raising Not_found #31