Don't break out a separate frame for ediff