Typo and whitespace fixes to reduce the diff with new VC.