Reintroduce bespin fix for nasty splitters.