4.4 edits.  WIP, cutting some of the idempotence stuff, but not yet replacing it