Support XCL again, by working around implementation bugs, documented in TODO.
Bump version to 3.1.0.28