Changes from the xtend generation.