Revert "replace two more instances of !! with implicit use of operator bool()"