Reorganization toward implementing proper branch synchronization
All tests pass again, most of the time, anyway