Improved save-tracking granularity