Fix boolean string comparisons. Make make simpler.