More code style changes

Revisions based on some of the guidelines listed in
http://blogs.msdn.com/b/brada/archive/2005/01/26/361363.aspx and
http://msdn.microsoft.com/en-us/library/ms229043.aspx (possibly more to
come along these lines).

No functionality changes, just renaming private members / parameters /
local variables, and rearranging code.