Fix up handling of "else" clauses