Cleanup after Jim's XFEM merge.