Polish up bo->state before we unleash streaming