Forgot some minor cleanup in spawn2.