Fix parsing of statements with additional clauses.