Use TM2 will-save callback instead of did-save.

* It's one save less!