Merge "Simplify XZ compression."