Make batteries.2.0.0 compile with 4.01 and 4.02

This updates the batteres.2.0.0 package to make it compilable with recent dev versions of OCaml. Note that there has not been a new upstream release -- these are just backported changes from trunk.