Bug 18996: [QA Follow-up] Remove global variables from Message.t