setup: reshuffle code more.

No functional changes yet.
setup: split update for add/del

Also repair previous commit, where we diverted before having the add/del lists built.