WIP on the remaining split cases.