Fix XForm code generation