Some editorial changes to fix bikeshed errors.