Further separate s2i and qtodo logic.