Fix up auto-frame-disposer