Artifacts of emf-diffmerge-core-generic #33