r16572: More comments and simple refactoring of one condition.