Replaced obscure boolean construct