Finish up with the splitting.
Fixup the pattern matching to again pass the tests we did before.