Backport some main.c cleanup from the py3k branch
1 file changed