Kill off the use of BOOL some more for bool.