White space, commented out code, some other minor fixes.
--HG-- extra : convert_revision : 886e762e13b7a05d6d8a14bde6c2a3567c32a4d1
--HG-- extra : convert_revision : d4e19afda897bc3797868b40469ce2ec7ec7d251