Fix Xexpr nesting.