WINTERMUTE: Fix and clean up BaseSurfaceOSystem::finishLoad()

This fixes a couple of cases which fell through the cracks of the
previous chain of conditions, including 16bpp images and 32bpp images
without alpha. The latter partially fixes bug #3600667.