Reformat to use new GateIn syntax for easing sync