Branch merge miss

Apparently I missed merging in some changes from branches that I thought were committed, and maybe they were but didn't get pushed. The network graph looked wrong, so better to clean it up now than miss something later.