More BOOL usage killed off.