BTW please avoid gratuitous formatting changes—they clutter the diff.