Updates for ebnf 0.2.1, includes better branch tables and recovery.