The control-flow builders need their logic updating to capture variable declarations and usages, in order to manually build up the set of closure variables and local definitions for control-flow blocks.