Use new control-flow macro