Minimum fixes to make freeze.py do something useful.