Another possibly neat comparison:

Original: https://github.com/roundcube/roundcubemail/blob/master/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php#L206

Cleanup: https://github.com/daviddeutsch/roundcubemail/blob/37167c5ce1c00cb4f42b7f59a9ff56b81b3cd874/plugins/managesieve/lib/Roundcube/rcube_sieve_engine.php#L219

The code may be /slightly/ less DRY, but, I find, a lot more readable.

I must also say that so far, I find very few yoda conditions! ;-)