Make string-splitting more idiomatic