 	 (dir (concat root-dir "/Applications/Specware/Handwritten/Lisp"))
 	 (bin-dir (concat root-dir
 			     "/Applications/Specware/bin/"
-			     (if (memq system-type '(ms-dos windows-nt windows-95
-						     ms-windows))
+			     (if *windows-system-p*
 				 "windows"
 			       (symbol-name system-type))))
 	 (world-name (concat bin-dir "/Specware4.dxl")))

    (setq sw:common-lisp-directory root-dir)
    (setq sw:common-lisp-image-name (getenv "LISP_EXECUTABLE"))
    (setq sw:common-lisp-image-file world-name)
    (setq sw:common-lisp-image-arguments nil ;'("+c")
	  )

    (sw:common-lisp sw:common-lisp-buffer-name
		    sw:common-lisp-directory
		    sw:common-lisp-image-name
		    sw:common-lisp-image-arguments
		    sw:common-lisp-host
		    sw:common-lisp-image-file
		    )
    ))
  (let* ((root-dir (concat (getenv "SPECWARE4") "/"))
	 (bin-dir (concat root-dir
			  "Applications/PSL/bin/"
			  (if *windows-system-p*
			      "windows"
			    (symbol-name system-type))))
	 (world-name (concat bin-dir "/PSL.dxl")))
