XFEM converges for 6 dof enrichment but not for 7.
Some cleanup regarding xfem