various cleanups, hooks for parallel_cmp.py