Reorganize mkwin a bit. (dm)