Some more refactoring of check*Status() functions.