#18 commonize to XCMessage and XCRaw