Improve X<> support