#18 Commonize to XCEnd