Better argument splitting