More cleanup of gfx_rain.