Better handling of defer. Package shconf moved to shutil