Change the way we handle unique message identification.