Put condition on same line as if/unless

Inspired by discussion on issue #151