Reorganize PSF file parsing. It should be more robust now at the expense of
relying on section titles in PSF comment blocks.  However, those comment blocks
seem to be far more reliable than section ordering and presence.