eliminating uses of `checkIf` wherever possible.  Only one usage remains...