This reverts commit eaac258d.

The benefits in terms of readability are uncertain and YMMV, but
compilers seem to find it harder to optimize too:

   cmpl   $0x0,-0x205c(%rbp)
   sete   %al
   movzbl %al,%eax
   or     %rax,%rdx

Before the change it would translate to just:

   or     $0x1,%rax
   mov    %rax,%rdx

Spotted by @fgsch