remove demo slide
give a name to some of the parsers, for better error messages
put dangling else first