Infrastructure Overhaul Should Focus More on Safety, Advocates Say