WIP: More refactor of Sigmet IOSP.