Some simplifications in finformat.cpp.