Massively simplified sync internals