Use better control-flow libraries