OS/2 support restored in cleaner form.