More computeBoolean() optimizations and clean up.