Refactor to make SplitAfterCall obsolete.

This fixes #26.