Good call. I had intended to clean up the various `message.` stuff once I finalised the message classes and never got to it. Thanks!