Add experimental removal of non-trivial moves.