Fix a static function's naming.
Clean-up, clarify error handling during a split -- not finished, but better.