The augmenting flag not being final is a side-effect of how choice introduces implicit case statements. This is a rather unfortunate leak, which is preventing us from modifying structure inlining. Make sure implicit case statements are created when children effective statements are introduced, without having to reset the flag.