Great, thanks!  Please ask about the whitespace, too.  I think the changes, though ugly in the context of the PR, are good because a lot of people's editors are set up to strike them automatically.  But if they are really troublesome I can just redo my changes in a new PR with whitespace fixing disabled.