uniform Batteries_uni in plan.ml and plan.mli