Small improvement to notification code.