Move refactoring participant for #610