Fix the aggresive string trimming performed by only removing *leading* whitespace and keeping trailing