migrate to latest xtend changes