r19118: get rid of a bunch of bool misuse warnings