mkwinpeimg: Improve preceding commit