.3y285hh: Moved change persistence until the end

This fixes the race condition, and also speeds up response to changes,
at the cost of not surfacing persistence errors to the user so
obviously.