Partial support for OS/2v2 BMPs with reduced-size headers
Minor refactoring