Final commit. (These changes were made long ago, but I am just now committing them.)