Update the documentation, and back out a few ill-considered changes
whose folly I failed to realize for failure to read the documentation.