xdata merge cleanup, remove (r)evolver
R: fix an SGM test case.