Clean up the sync.h macros