Matching to live version. (Mostly whitespace changes.)