Be a bit more generous with where spaces go when parsing