bool clean-up fixup

Change-Id: I0a302d7f91ef07992f95a8ccd48efec862519ab1