Fix up documentation/usage messages for r6572.