Cleanup conditional use &&= instead of predicate presence