#523, #607: Wording clarification