refs #6485 More changes to GetFi and HFIRLoad.