Shutdown risk eases as Senate pushes toward funding vote