cleanup antipatterns related to booleans