Minor cleanup
Refactored the code that decides which module to use.
Try to support 16-bit EPOC MBM (etc.) images