Guard-id's are now pushed/popped on a stack when encountering splits-control-flow/merges-control-flow annotations

Ignore last commit title... made a mistake