Improve cactus spawning. Fixes #235.