Improve PE Cab archive detection; tidy up.