Consistentify boolean usage