Replace poor implementation of split-point with something more sensible.