Correct implementations of analysis split/merge.

Wires in the new code in SBT 0.13.1.