More rules

Favor modifier if/unless/while/until.