Simplification within reorg.c