Port to XText 2.7.2