Fix handling of spaces around split delimiters to correct bad behavior