[sgen] Unify non-concurrent and concurrent M&S.