Defer rebuilding until after save is complete.