Fix end token for conditionals.  Close #404