Got rid of BOOLs where possible.