Add a spawn_with! macro and clean up some spawns