Better patch for Menhir.