Part 1 of bug fixes for state files in fileutil.