r25482: Slightly simplify logic