Flow control: minor cleanup