Revised Analyses of Decommissioning Reference Non-Fuel-Cycle-Facilities by United States Government