Cleaning up save/restore semantics, especially for tags
Fixed merger