Misc cleanups. Remove remnants from incomplete merge in fi.h, remove unused PFX define (use PACKAGE instead). Remove duplicate min/max defines, use version in fi.h.