reverted whitespace changes to minimize diff.  I plan to put them back in in a dedicated commit elsewhere.