Move the DIE/DSE rerun to take account of auto-disabled contexts to happen after the expansion of terminated loops which are not being committed.