Unload: minor refactorring.