Remove using-tuple splitting entirely (nothing was using it, and it was taking up space and causing bugs)