anchor.diff:                                      Some "Fuel irrelevance",
                                       ("@fuel_irrelevance_" ^g)) in
               let aux_decls, g_typing =
  -              let vars, v_guards, env, binder_decls, _ = encode_binders None formals env0 in
  -              let vars_tm = List.map mkFreeV vars in
                 let gapp = mkApp(g, fuel_tm::vars_tm) in
                 let tok_corr =
                   let tok_app = mk_Apply (mkFreeV (gtok, Term_sort)) (fuel::vars) in
                   Util.mkAssume(mkForall (U.range_of_lbname lbn) ([[tok_app]], fuel::vars, mkEq(tok_app, gapp)),
  -                            Some "Fuel token correspondence",
  -                            ("fuel_token_correspondence_"^gtok))
  +                              Some "Fuel token correspondence",
  +                              ("fuel_token_correspondence_"^gtok))
                 in
                 let aux_decls, typing_corr =
  -                let g_typing, d3 = encode_term_pred None tres env gapp in
  -                d3, [Util.mkAssume(mkForall (U.range_of_lbname lbn) ([[gapp]], fuel::vars, mkImp(mk_and_l v_guards, g_typing)),
  +                let g_typing, d3 = encode_term_pred None tres env' gapp in
  +                d3, [Util.mkAssume(mkForall (U.range_of_lbname lbn)
  +                                            ([[gapp]], fuel::vars, mkImp(guard, g_typing)),
                                       Some "Typing correspondence of token to term",
                                       ("token_correspondence_"^g))]
                 in
  
positive.code:                 let formals, c = SS.open_comp formals c in
                  let tres_comp = get_result_comp c in
                  let binders, body = eta_expand [] formals e (U.comp_result tres_comp) in
                  (binders, body, formals, tres_comp), false
                | Tm_refine (bv, _) -> aux' bv.sort
                | _ -> ([], e, [], S.mk_Total t_norm), false
              in
              aux' t_norm
            end
  
negative.code: 
              let vars, guards, env', binder_decls, _ = encode_binders None binders env' in
              let guard, guard_decls =
                  match pre_opt with
                  | None -> mk_and_l guards, []
                  | Some pre ->
  