Improved handling of OPM files.