consistency and clarification fixes for messages merged in r107919