Trying to clean up duplicate checks & whatnot in our listeners.