Table scanner save/restore

Yeah, I read this incorrectly as handling sub-partitions within the top level partitions. Will fix.