Minimal changes to make the "freeze" tool work again.

There are other issues left, but these were basics (e.g. keys().sort()).