Update for Xtend 2.4.x.