splitter: Improve "else" handling