Done. Modified `_safe_split` accordingly.