Leading whitespace was being trimmed in too many places,
it is now done in just one place.