More refactoring of exception consistency coverage check.