Merge "Extract typedefs to local variable to avoid error in xtend generated class."