aligning to latest xtend changes