Did some more refactoring on the in-memory events and the Message class.