Move flag removal to yield constructor.