Minor clean up, regenerated with latest Xtend