A few cleanups in the 'split' flow