Simplifications for lisp/term/common-win.el