Clean up code-gen control flow helpers