Update parser interface to latest menhir-annot