Follow-up to r47361: code style cleanup (consolidate a couple of duplicated checks...