Slightly change split() API