Add BLOCK_SPAWN. This introduced a regression.

I'm trying to track down the regression, but it doesn't look easy,
so I'm committing the semi-working state first.