See FIXME (formerly XXX) -- though I think the current data structure might be as good as we can get. (It could instead be a pair of "what to do if the file doesn't exist / what to do if the file exists", but we want to rule out some possible combinations.)