Revert "Fix for unless/when."

This reverts commit b12d91e726ae5d1742e6d828c2cb5b694ffdf8a3.