* Reimplement #20320 less elegantly but handle odd check orders better * Consolidate 2 of 3 conditions