Fixed forms.xtext, ... for now