Please avoid whitespace changes throughout your patch