Fixing unless helper to work with else. Fixes #988