Fix more white-space noise