
          Clean up some more syntax and terminology.

889b589