Stripped spaces per issue #6478. For real this time.