Some fixes to assertion splitting.