WIP: even cleaner splitter interface