In Infrastructure Law, a Stronger Emphasis on Highway Safety