TSAGE: Cleaner implementation of saving disable code