Get rid of BOOLs where possible.