Sort out more white-space diff issues