...to cater for forthcoming loplugin:implicitboolconversion improvements

Change-Id: I88c0c4681137022005c3a4c418e91cb17bc17148