Revert menhir to non-manually dictionary save. Fix save issue.