Upstream changes

Automatically opened by http://forkbomb.io
Never use `unless` with `else`. Rewrite these with the positive case first.