Move the Xtext bug fixes into dedicated classes.
fixup! Move the Xtext bug fixes into dedicated classes.