More clean-up in computeBoolean() code.