Minor changes to make XTL experiment with variant compile under GCC