Second part of fix for #493826: regenerated suite modules so errn exists but == 0 doesn't signal an error.

Bugfix candidate.
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
index c17b5eb..4e82b67 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/CodeWarrior_suite.py
@@ -37,7 +37,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -61,7 +61,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -80,7 +80,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -100,7 +100,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -120,7 +120,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -140,7 +140,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -159,7 +159,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -179,7 +179,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -198,7 +198,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -217,7 +217,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -237,7 +237,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
index 29ada42..cfac353 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/Metrowerks_Shell_Suite.py
@@ -32,7 +32,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -58,7 +58,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -77,7 +77,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -103,7 +103,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -129,7 +129,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -154,7 +154,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -175,7 +175,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -195,7 +195,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -222,7 +222,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -248,7 +248,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -268,7 +268,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -288,7 +288,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -308,7 +308,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -328,7 +328,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -349,7 +349,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -374,7 +374,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -402,7 +402,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -428,7 +428,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -447,7 +447,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -468,7 +468,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -487,7 +487,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -514,7 +514,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -534,7 +534,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -554,7 +554,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -574,7 +574,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -600,7 +600,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -626,7 +626,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -651,7 +651,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -676,7 +676,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -697,7 +697,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -722,7 +722,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -742,7 +742,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -762,7 +762,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -783,7 +783,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py
index b583b29..56d10bb 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/Required.py
@@ -33,7 +33,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py
index 7b7516d..ffe121e 100644
--- a/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/CodeWarrior/Standard_Suite.py
@@ -35,7 +35,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -61,7 +61,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -87,7 +87,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -120,7 +120,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -140,7 +140,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -165,7 +165,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py b/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
index e48bb6e..167378e 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/Microsoft_Internet_Explorer.py
@@ -1,7 +1,7 @@
 """Suite Microsoft Internet Explorer Suite: Events defined by Internet Explorer
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
+Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -13,8 +13,8 @@
 class Microsoft_Internet_Explorer_Events:
 
 	def GetSource(self, _object=None, _attributes={}, **_arguments):
-		"""GetSource: Get the html source of a browser window
-		Required argument: The index of the window to get the source from.  No value means get the source from the frontmost browser window.
+		"""GetSource: Get the HTML source of a browser window
+		Required argument: Window Identifier of window from which to get the source. No value means get the source from the frontmost window.
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: undocumented, typecode 'TEXT'
 		"""
@@ -27,7 +27,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -40,7 +40,7 @@
 	def do_script(self, _object, _attributes={}, **_arguments):
 		"""do script: Execute script commands
 		Required argument: JavaScript text to execute
-		Keyword argument window: optional ID of window (as specified by the ListWindows event) to execute the script in
+		Keyword argument window: optional Window Identifier (as supplied by the ListWindows event) specifying context in which to execute the script
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: Return value
 		"""
@@ -53,7 +53,27 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
+			raise aetools.Error, aetools.decodeerror(_arguments)
+		# XXXX Optionally decode result
+		if _arguments.has_key('----'):
+			return _arguments['----']
+
+	def PrintBrowserWindow(self, _object=None, _attributes={}, **_arguments):
+		"""PrintBrowserWindow: Print contents of browser window (HTML)
+		Required argument: Window Identifier of the window to print. No value means print the frontmost browser window.
+		Keyword argument _attributes: AppleEvent attribute dictionary
+		"""
+		_code = 'misc'
+		_subcode = 'pWND'
+
+		if _arguments: raise TypeError, 'No optional args expected'
+		_arguments['----'] = _object
+
+
+		_reply, _arguments, _attributes = self.send(_code, _subcode,
+				_arguments, _attributes)
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py
index d789c5d..588cd8f 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/Netscape_Suite.py
@@ -1,7 +1,7 @@
-"""Suite Netscape Suite: Events defined by Netscape.
+"""Suite Netscape Suite: Events defined by Netscape
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
+Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -13,7 +13,7 @@
 class Netscape_Suite_Events:
 
 	def Open_bookmark(self, _object=None, _attributes={}, **_arguments):
-		"""Open bookmark: Reads in a bookmark file
+		"""Open bookmark: Opens a bookmark file
 		Required argument: If not available, reloads the current bookmark file
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
@@ -26,7 +26,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py
index d9d2b9f..7497f37 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/Required_Suite.py
@@ -1,7 +1,7 @@
 """Suite Required Suite: Events that every application should support
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
+Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -26,7 +26,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -46,7 +46,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -66,7 +66,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -85,7 +85,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py
index 820d3f7..4f78802 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/URL_Suite.py
@@ -1,7 +1,7 @@
 """Suite URL Suite: Standard suite for Uniform Resource Locators
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
+Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -18,8 +18,8 @@
 
 	def GetURL(self, _object, _attributes={}, **_arguments):
 		"""GetURL: Open the URL (and optionally save it to disk)
-		Required argument: The URL
-		Keyword argument to: Save the resolved URL contents to this file.
+		Required argument: URL to open
+		Keyword argument to: File into which to save resource located at URL.
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		"""
 		_code = 'GURL'
@@ -31,7 +31,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py b/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py
index 0416617..b95083d 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/Web_Browser_Suite.py
@@ -1,7 +1,7 @@
-"""Suite Web Browser Suite: Class of events which are sent to Web Browser applications
+"""Suite Web Browser Suite: Class of events supported by Web Browser applications
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
+Generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -17,23 +17,18 @@
 		'toWindow' : 'WIND',
 		'Flags' : 'FLGS',
 		'FormData' : 'POST',
-		'MIMEType' : 'MIME',
-		'ProgressApp' : 'PROG',
-		'ResultApp' : 'RSLT',
+		'MIME_Type' : 'MIME',
 	}
 
 	def OpenURL(self, _object, _attributes={}, **_arguments):
 		"""OpenURL: Retrieves URL off the Web.
-		Required argument: Fully specified URL
-		Keyword argument to: File to save downloaded data into.
-		Keyword argument toWindow: Window to open this URL into. (Use -1 for top window, 0 for new window)
+		Required argument: Fully-qualified URL
+		Keyword argument to: Target file for saving downloaded data
+		Keyword argument toWindow: Target window for resource at URL (-1 for top window, 0 for new window)
 		Keyword argument Flags: Valid Flags settings are: 1-Ignore the document cache; 2-Ignore the image cache; 4-Operate in background mode.
-		Keyword argument FormData: Posting of forms of a given MIMEType.
-		Keyword argument MIMEType: MIME type for the FormData.  
-		Keyword argument ProgressApp: If specified, ProgressApp can be named to handle the user interface for process messages. 
-		Keyword argument ResultApp: When the requested URL has been accessed and all associated documents loaded, the Web browser will issue an OpenURLResult to the ResultApp.
+		Keyword argument FormData: data to post
+		Keyword argument MIME_Type: MIME type of data being posted
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TransactionID
 		"""
 		_code = 'WWW!'
 		_subcode = 'OURL'
@@ -44,28 +39,25 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
 	_argmap_ShowFile = {
-		'MIME_type' : 'MIME',
-		'Window_ID' : 'WIND',
+		'MIME_Type' : 'MIME',
+		'Window_Identifier' : 'WIND',
 		'URL' : 'URL ',
-		'ResultApp' : 'RSLT',
 	}
 
 	def ShowFile(self, _object, _attributes={}, **_arguments):
-		"""ShowFile: Passes FileSpec containing data of a given MIME type to be rendered in a given WindowID.
-		Required argument: The file to show.
-		Keyword argument MIME_type: MIME type
-		Keyword argument Window_ID: ID of the window to open the file into. (Can use -1 for top window)
-		Keyword argument URL: A URL which allows this document to be reloaded if necessary.
-		Keyword argument ResultApp: When the requested URL has been accessed and all associated documents loaded, the Web browser will issue a ShowFileResult to the ResultApp.
+		"""ShowFile: FileSpec containing data of specified MIME type to be rendered in window specified by Window Identifier.
+		Required argument: The file
+		Keyword argument MIME_Type: MIME type
+		Keyword argument Window_Identifier: Identifier of the target window for the URL. (Can use -1 for top window)
+		Keyword argument URL: URL that allows this document to be reloaded.
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: TransactionID
 		"""
 		_code = 'WWW!'
 		_subcode = 'SHWF'
@@ -76,61 +68,14 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def CancelTransaction(self, _object, _attributes={}, **_arguments):
-		"""CancelTransaction: Tells the Web browser to cancel a TransactionID is progress which the application has initiated via an OpenURL or ShowFile command.
-		Required argument: TransactionID
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'CANT'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_QueryVersion = {
-		'Major_Version' : 'MAJV',
-		'Minor_Version' : 'MINV',
-	}
-
-	def QueryVersion(self, _no_object=None, _attributes={}, **_arguments):
-		"""QueryVersion: Tells the Web browser that an application which wishes to communicate with it supports a specific version (major.minor) of this SDI specification
-		Keyword argument Major_Version: Major version of the SDI specification the sending application supports. 
-		Keyword argument Minor_Version: Minor version of the SDI specification the sending application supports. 
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns:      
-		"""
-		_code = 'WWW!'
-		_subcode = 'QVER'
-
-		aetools.keysubst(_arguments, self._argmap_QueryVersion)
-		if _no_object != None: raise TypeError, 'No direct arg expected'
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
 	def CloseAllWindows(self, _no_object=None, _attributes={}, **_arguments):
-		"""CloseAllWindows: Tells the Web browser to close all windows
+		"""CloseAllWindows: Closes all windows
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: Success
 		"""
@@ -143,7 +88,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -155,9 +100,9 @@
 	}
 
 	def CloseWindow(self, _no_object=None, _attributes={}, **_arguments):
-		"""CloseWindow: Tells the Web browser to close the window specified either by Window ID or Title. If no parameters are specified, the top window will be closed.
+		"""CloseWindow: Close the window specified by either Window Identifier or Title. If no parameter is specified, close the top window.
 		Keyword argument ID: ID of the window to close. (Can use -1 for top window)
-		Keyword argument Title: Title of the window to close.
+		Keyword argument Title: Title of the window to close
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: Success
 		"""
@@ -170,40 +115,35 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
-	_argmap_Activate = {
-		'Flags' : 'FLGS',
-	}
-
 	def Activate(self, _object=None, _attributes={}, **_arguments):
-		"""Activate: Tells the Web browser to bring itself to the front and show WindowID. (Can use -1 for top window)
-		Required argument: WindowID
-		Keyword argument Flags: Reserved for future use 
+		"""Activate: Activate Internet Explorer and optionally select window designated by Window Identifier.
+		Required argument: Window Identifier
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: WindowID of the front window
+		Returns: Window Identifier of window to activate
 		"""
 		_code = 'WWW!'
 		_subcode = 'ACTV'
 
-		aetools.keysubst(_arguments, self._argmap_Activate)
+		if _arguments: raise TypeError, 'No optional args expected'
 		_arguments['----'] = _object
 
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
 	def ListWindows(self, _no_object=None, _attributes={}, **_arguments):
-		"""ListWindows: Return a list of WindowIDs representing each windows currently being used by the Web browser.
+		"""ListWindows: Returns list of Window Identifiers for all open windows.
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: undocumented, typecode 'list'
 		"""
@@ -216,15 +156,15 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
 	def GetWindowInfo(self, _object, _attributes={}, **_arguments):
-		"""GetWindowInfo: Returns a window info record (URL/Title) for the specified window. 
-		Required argument: WindowID of the window to get info about
+		"""GetWindowInfo: Returns a window info record (URL/Title) for the specified window.
+		Required argument: Window Identifier of the window
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns:   
 		"""
@@ -237,7 +177,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -248,11 +188,11 @@
 	}
 
 	def ParseAnchor(self, _object, _attributes={}, **_arguments):
-		"""ParseAnchor: Combine a base URL and a relative URL to produce a fully-specified URL
-		Required argument: MainURL.The base URL.
-		Keyword argument withURL: RelativeURL, which, when combined with the MainURL (in the direct object), is used to produce a fully-specified URL.
+		"""ParseAnchor: Combines a base URL and a relative URL to produce a fully-qualified URL
+		Required argument: Base URL
+		Keyword argument withURL: Relative URL that is combined with the Base URL (in the direct object) to produce a fully-qualified URL.
 		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: The Fully specified URL
+		Returns: Fully-qualified URL
 		"""
 		_code = 'WWW!'
 		_subcode = 'PRSA'
@@ -263,353 +203,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_BeginProgress = {
-		'with_Message' : 'PMSG',
-	}
-
-	def BeginProgress(self, _object, _attributes={}, **_arguments):
-		"""BeginProgress: Initialize a progress indicator.
-		Required argument: TransactionID
-		Keyword argument with_Message: Message to display with the progress indicator.
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Success 
-		"""
-		_code = 'WWW!'
-		_subcode = 'PRBG'
-
-		aetools.keysubst(_arguments, self._argmap_BeginProgress)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_SetProgressRange = {
-		'Max' : 'MAXV',
-	}
-
-	def SetProgressRange(self, _object, _attributes={}, **_arguments):
-		"""SetProgressRange: Sets a max value for the progress indicator associated with TransactionID
-		Required argument: TransactionID
-		Keyword argument Max: Max value for this progress indicator
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'PRSR'
-
-		aetools.keysubst(_arguments, self._argmap_SetProgressRange)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_MakingProgress = {
-		'with_message' : 'PMSG',
-		'current_setting' : 'CURR',
-	}
-
-	def MakingProgress(self, _object, _attributes={}, **_arguments):
-		"""MakingProgress: Updates the progress indicator associated with TransactionID
-		Required argument: TransactionID
-		Keyword argument with_message: Message to display in the progress indicator
-		Keyword argument current_setting: Current value of the progress indicator
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Cancel
-		"""
-		_code = 'WWW!'
-		_subcode = 'PRMK'
-
-		aetools.keysubst(_arguments, self._argmap_MakingProgress)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def EndProgress(self, _object, _attributes={}, **_arguments):
-		"""EndProgress: Nortifies the application that the progress indicator associated with TransactionID is no longer needed.
-		Required argument: TransactionID
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'PREN'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def RegisterDone(self, _object, _attributes={}, **_arguments):
-		"""RegisterDone: Signals that all processing initiated by the RegisteNow event associated by TransactionID has finished.
-		Required argument: TransactionID
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: 0 = failure; 1 = success; 2 = sending application needs more time to complete operation.
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGDN'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_RegisterProtocol = {
-		'_for' : 'PROT',
-	}
-
-	def RegisterProtocol(self, _object, _attributes={}, **_arguments):
-		"""RegisterProtocol: Notifies that the sending application is able to handle all URLs for the specified protocol.
-		Required argument: application
-		Keyword argument _for: Protocol, such as NEWS, MAILTO, etc... 
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Success
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGPR'
-
-		aetools.keysubst(_arguments, self._argmap_RegisterProtocol)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_UnRegisterProtocol = {
-		'_for' : 'PROT',
-	}
-
-	def UnRegisterProtocol(self, _object, _attributes={}, **_arguments):
-		"""UnRegisterProtocol: Notifies that the sending application is no longer wishes to handle URLs for the specified protocol.
-		Required argument: application
-		Keyword argument _for: Protocol, such as NEWS, MAILTO, etc... 
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRP'
-
-		aetools.keysubst(_arguments, self._argmap_UnRegisterProtocol)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_RegisterViewer = {
-		'_for' : 'MIME',
-		'as' : 'FTYP',
-		'Flags' : 'MTHD',
-	}
-
-	def RegisterViewer(self, _object, _attributes={}, **_arguments):
-		"""RegisterViewer: Notifies that the sending application is able to handle all documents for the specified MIMEType.
-		Required argument: application
-		Keyword argument _for: MIMEType
-		Keyword argument as: File type for saved documents
-		Keyword argument Flags: undocumented, typecode 'shor'
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGVW'
-
-		aetools.keysubst(_arguments, self._argmap_RegisterViewer)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	_argmap_UnRegisterViewer = {
-		'_for' : 'MIME',
-	}
-
-	def UnRegisterViewer(self, _object, _attributes={}, **_arguments):
-		"""UnRegisterViewer: Notifies that the sending application is no longer wishes to handle documents of the specified MIMEType.
-		Required argument: application
-		Keyword argument _for: MIMEType
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNVW'
-
-		aetools.keysubst(_arguments, self._argmap_UnRegisterViewer)
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def RegisterURLEcho(self, _object, _attributes={}, **_arguments):
-		"""RegisterURLEcho: Notifies that the sending application would like to receive EchoURL events.
-		Required argument: application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		Returns: Success
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGUE'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def UnRegisterURLEcho(self, _object, _attributes={}, **_arguments):
-		"""UnRegisterURLEcho: Notifies that the sending application would no longer like to receive EchoURL events.
-		Required argument: application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRU'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def RegisterWindowClose(self, _object, _attributes={}, **_arguments):
-		"""RegisterWindowClose: Notifies that the sending application would like to receive WindowClose events.
-		Required argument: application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGWC'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def UnRegisterWindowClose(self, _object, _attributes={}, **_arguments):
-		"""UnRegisterWindowClose: Notifies that the sending application would no longer like to receive WindowClose events.
-		Required argument: application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRC'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def RegisterAppClose(self, _object, _attributes={}, **_arguments):
-		"""RegisterAppClose: Notifies that the sending application would like to receive AppClose events.
-		Required argument: application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'RGAC'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
-			raise aetools.Error, aetools.decodeerror(_arguments)
-		# XXXX Optionally decode result
-		if _arguments.has_key('----'):
-			return _arguments['----']
-
-	def UnRegisterAppClose(self, _object, _attributes={}, **_arguments):
-		"""UnRegisterAppClose: Notifies that the sending application would no longer like to receive AppClose events.
-		Required argument: application
-		Keyword argument _attributes: AppleEvent attribute dictionary
-		"""
-		_code = 'WWW!'
-		_subcode = 'UNRA'
-
-		if _arguments: raise TypeError, 'No optional args expected'
-		_arguments['----'] = _object
-
-
-		_reply, _arguments, _attributes = self.send(_code, _subcode,
-				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Explorer/__init__.py b/Mac/Lib/lib-scriptpackages/Explorer/__init__.py
index 2a49f2e..fd917cc 100644
--- a/Mac/Lib/lib-scriptpackages/Explorer/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/Explorer/__init__.py
@@ -1,45 +1,51 @@
 """
-Package generated from Macintosh HD:Internet:Internet-programma's:Internet Explorer 4.5-map:Internet Explorer 4.5
+Package generated from Moes:Applications (Mac OS 9):Internet Explorer 5:Internet Explorer
 Resource aete resid 0 
 """
 import aetools
+Error = aetools.Error
+import Required_Suite
+import Standard_Suite
 import Web_Browser_Suite
 import URL_Suite
 import Microsoft_Internet_Explorer
 import Netscape_Suite
-import Required_Suite
 
 
 _code_to_module = {
+	'reqd' : Required_Suite,
+	'****' : Standard_Suite,
 	'WWW!' : Web_Browser_Suite,
 	'GURL' : URL_Suite,
 	'MSIE' : Microsoft_Internet_Explorer,
 	'MOSS' : Netscape_Suite,
-	'reqd' : Required_Suite,
 }
 
 
 
 _code_to_fullname = {
+	'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
+	'****' : ('Explorer.Standard_Suite', 'Standard_Suite'),
 	'WWW!' : ('Explorer.Web_Browser_Suite', 'Web_Browser_Suite'),
 	'GURL' : ('Explorer.URL_Suite', 'URL_Suite'),
 	'MSIE' : ('Explorer.Microsoft_Internet_Explorer', 'Microsoft_Internet_Explorer'),
 	'MOSS' : ('Explorer.Netscape_Suite', 'Netscape_Suite'),
-	'reqd' : ('Explorer.Required_Suite', 'Required_Suite'),
 }
 
+from Required_Suite import *
+from Standard_Suite import *
 from Web_Browser_Suite import *
 from URL_Suite import *
 from Microsoft_Internet_Explorer import *
 from Netscape_Suite import *
-from Required_Suite import *
 
 
-class Explorer(Web_Browser_Suite_Events,
+class Explorer(Required_Suite_Events,
+		Standard_Suite_Events,
+		Web_Browser_Suite_Events,
 		URL_Suite_Events,
 		Microsoft_Internet_Explorer_Events,
 		Netscape_Suite_Events,
-		Required_Suite_Events,
 		aetools.TalkTo):
 	_signature = 'MSIE'
 
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py b/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py
index 26df454..2914cc3 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Containers_and_folders.py
@@ -1,7 +1,7 @@
 """Suite Containers and folders: Classes that can contain other file system items
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -46,6 +46,10 @@
 	"""icon size - the size of icons displayed in the window. Can be specified as a number, or ... """
 	which = 'lvis'
 	want = 'long'
+class view_options_window(aetools.NProperty):
+	"""view options window - the view options window for the container (can only be opened when the container window is open) """
+	which = 'vwnd'
+	want = 'vwnd'
 #        element 'cobj' as ['indx', 'name']
 #        element 'ctnr' as ['indx', 'name']
 #        element 'sctr' as ['indx', 'name']
@@ -276,6 +280,7 @@
 	'completely_expanded' : completely_expanded,
 	'icon_size' : icon_size,
 	'icon_size' : icon_size,
+	'view_options_window' : view_options_window,
 }
 container._elemdict = {
 	'item' : Earlier_terms.item,
@@ -437,44 +442,45 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'priv' : sharing_privileges,
-	'cfol' : folder,
-	'cdis' : disk,
-	'sctr' : sharable_container,
-	'ctnr' : container,
-	'cdsk' : desktop_2d_object,
 	'ctrs' : trash_2d_object,
+	'cdsk' : desktop_2d_object,
+	'sctr' : sharable_container,
+	'priv' : sharing_privileges,
+	'cdis' : disk,
+	'cfol' : folder,
+	'ctnr' : container,
 }
 
 _propdeclarations = {
-	'ownr' : owner_privileges,
-	'spro' : protected,
-	'frsp' : free_space,
-	'sgrp' : group,
-	'pexc' : completely_expanded,
-	'sele' : selection,
-	'smou' : mounted,
-	'pexa' : expandable,
-	'istd' : startup,
-	'sdsk' : startup_disk,
+	'pexp' : expanded,
 	'gppr' : group_privileges,
-	'shar' : shared,
-	'capa' : capacity,
-	'isej' : ejectable,
-	'gstp' : guest_privileges,
+	'prvr' : see_files,
+	'ects' : entire_contents,
+	'lvis' : icon_size,
+	'iprv' : privileges_inherited,
+	'isrv' : local_volume,
+	'frsp' : free_space,
+	'pexa' : expandable,
+	'pexc' : completely_expanded,
+	'vwnd' : view_options_window,
 	'warn' : warns_before_emptying,
 	'sown' : owner,
-	'c@#^' : _3c_Inheritance_3e_,
-	'sexp' : exported,
-	'isrv' : local_volume,
-	'iprv' : privileges_inherited,
-	'lvis' : icon_size,
-	'trsh' : trash,
-	'prvs' : see_folders,
-	'prvr' : see_files,
 	'prvw' : make_changes,
-	'pexp' : expanded,
-	'ects' : entire_contents,
+	'isej' : ejectable,
+	'capa' : capacity,
+	'shar' : shared,
+	'sexp' : exported,
+	'sdsk' : startup_disk,
+	'istd' : startup,
+	'gstp' : guest_privileges,
+	'trsh' : trash,
+	'smou' : mounted,
+	'sele' : selection,
+	'prvs' : see_folders,
+	'sgrp' : group,
+	'c@#^' : _3c_Inheritance_3e_,
+	'spro' : protected,
+	'ownr' : owner_privileges,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py b/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py
index 6ec7e53..d65043d 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Earlier_terms.py
@@ -1,7 +1,7 @@
 """Suite Earlier terms: Terms that have been renamed
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -401,8 +401,10 @@
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
-
-resizable = titled
+class resizable(aetools.NProperty):
+	"""resizable - Is the window resizable? """
+	which = 'prsz'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -615,110 +617,111 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'iwnd' : information_window,
-	'cwnd' : container_window,
-	'inlf' : internet_location,
-	'appf' : application_file,
-	'prcs' : process,
-	'cobj' : item,
-	'cwin' : window,
-	'pcda' : accessory_process,
-	'ctrs' : trash_2d_object,
-	'capp' : application,
+	'dsut' : accessory_suitcase,
 	'cprf' : preferences,
 	'sctr' : sharable_container,
-	'dsut' : accessory_suitcase,
+	'capp' : application,
+	'ctrs' : trash_2d_object,
+	'pcda' : accessory_process,
+	'cwin' : window,
+	'iwnd' : information_window,
+	'prcs' : process,
+	'appf' : application_file,
+	'inlf' : internet_location,
+	'cwnd' : container_window,
+	'cobj' : item,
 }
 
 _propdeclarations = {
-	'pidx' : index,
-	'scda' : show_creation_date,
-	'qpro' : properties,
-	'fshr' : file_sharing,
-	'pvew' : view,
-	'pusd' : partition_space_used,
-	'aslk' : locked,
-	'sdat' : show_modification_date,
-	'issl' : selected,
-	'pvis' : visible,
-	'slbl' : show_label,
-	'wshd' : collapsed,
-	'cdis' : disk,
-	'usme' : use_simple_menus,
-	'sord' : sort_direction,
-	'sexp' : exported,
-	'comt' : comment,
-	'dscr' : description,
-	'svew' : previous_list_view,
-	'svrs' : show_version,
-	'sknd' : show_kind,
-	'phys' : physical_size,
-	'iarr' : spatial_view_arrangement,
-	'smou' : mounted,
-	'posn' : position,
-	'cobj' : item,
-	'revt' : remote_events,
-	'asmo' : modification_date,
-	'ssiz' : show_size,
-	'pnam' : name,
-	'mprt' : minimum_partition_size,
-	'cwin' : window,
-	'pcli' : clipboard,
-	'spro' : protected,
-	'sprt' : suggested_partition_size,
-	'pisf' : frontmost,
-	'sele' : selection,
-	'pmod' : modal,
-	'fcrt' : creator_type,
-	'shar' : shared,
-	'dwnd' : content_space,
-	'zumf' : zoomed_full_size,
-	'sfsz' : calculate_folder_sizes,
-	'ID  ' : id,
-	'c@#^' : _3c_Inheritance_3e_,
-	'pspd' : stationery,
-	'iprv' : inherited_privileges,
-	'pfrp' : Finder_preferences,
-	'barr' : button_view_arrangement,
-	'ownr' : owner_privileges,
-	'drwr' : popup,
-	'sgrp' : group,
-	'ptsz' : size,
-	'kind' : kind,
-	'pull' : pulled_open,
-	'abbx' : about_this_computer,
-	'ctnr' : container,
-	'ascd' : creation_date,
-	'desk' : desktop,
-	'warn' : warn_before_emptying,
-	'iszm' : zoomable,
-	'isab' : scriptable,
-	'gstp' : guest_privileges,
-	'vers' : version,
-	'dela' : delay_before_springing,
-	'ptit' : titled,
-	'uswg' : use_wide_grid,
-	'cuss' : has_custom_view_settings,
-	'labi' : label_index,
-	'iwnd' : information_window,
-	'file' : file,
-	'asty' : file_type,
-	'appt' : partition_size,
-	'scom' : show_comments,
-	'pins' : insertion_location,
-	'pbnd' : bounds,
-	'urdt' : use_relative_dates,
-	'fsup' : sharing_starting_up,
-	'sown' : owner,
-	'isfl' : floating,
-	'hclb' : closeable,
-	'iimg' : icon,
-	'gppr' : group_privileges,
-	'asdr' : folder,
-	'sprg' : spring_open_folders,
-	'pzum' : zoomed,
 	'ver2' : product_version,
+	'pbnd' : bounds,
+	'asdr' : folder,
+	'gppr' : group_privileges,
+	'pidx' : index,
+	'isfl' : floating,
+	'sown' : owner,
+	'fsup' : sharing_starting_up,
+	'urdt' : use_relative_dates,
+	'scom' : show_comments,
+	'appt' : partition_size,
+	'iimg' : icon,
+	'asty' : file_type,
+	'uswg' : use_wide_grid,
+	'ptit' : titled,
+	'dela' : delay_before_springing,
+	'cuss' : has_custom_view_settings,
+	'gstp' : guest_privileges,
+	'isab' : scriptable,
+	'iszm' : zoomable,
+	'sord' : sort_direction,
+	'pins' : insertion_location,
+	'pspd' : stationery,
+	'desk' : desktop,
+	'ascd' : creation_date,
+	'ctnr' : container,
+	'abbx' : about_this_computer,
+	'pull' : pulled_open,
+	'kind' : kind,
+	'ptsz' : size,
+	'hclb' : closeable,
+	'sgrp' : group,
 	'mfre' : largest_free_block,
+	'revt' : remote_events,
+	'drwr' : popup,
+	'iwnd' : information_window,
+	'ownr' : owner_privileges,
+	'pzum' : zoomed,
+	'prsz' : resizable,
+	'barr' : button_view_arrangement,
+	'pfrp' : Finder_preferences,
+	'zumf' : zoomed_full_size,
+	'iprv' : inherited_privileges,
+	'vers' : version,
+	'c@#^' : _3c_Inheritance_3e_,
+	'ID  ' : id,
+	'sfsz' : calculate_folder_sizes,
+	'file' : file,
+	'dwnd' : content_space,
+	'shar' : shared,
+	'pmod' : modal,
+	'sele' : selection,
+	'pisf' : frontmost,
+	'sprt' : suggested_partition_size,
+	'spro' : protected,
+	'pcli' : clipboard,
+	'cwin' : window,
+	'mprt' : minimum_partition_size,
+	'sprg' : spring_open_folders,
+	'ssiz' : show_size,
+	'asmo' : modification_date,
+	'svrs' : show_version,
+	'cobj' : item,
+	'posn' : position,
+	'iarr' : spatial_view_arrangement,
+	'phys' : physical_size,
+	'sknd' : show_kind,
+	'labi' : label_index,
+	'svew' : previous_list_view,
+	'dscr' : description,
+	'comt' : comment,
+	'sexp' : exported,
+	'usme' : use_simple_menus,
+	'cdis' : disk,
+	'wshd' : collapsed,
+	'slbl' : show_label,
+	'warn' : warn_before_emptying,
+	'scda' : show_creation_date,
+	'pvis' : visible,
+	'issl' : selected,
+	'smou' : mounted,
+	'sdat' : show_modification_date,
+	'fcrt' : creator_type,
+	'pusd' : partition_space_used,
+	'pvew' : view,
+	'fshr' : file_sharing,
+	'qpro' : properties,
+	'aslk' : locked,
+	'pnam' : name,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py b/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py
index 3d3f3e1..9ef08a8 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Enumerations.py
@@ -1,7 +1,7 @@
 """Suite Enumerations: Enumerations for the Finder
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -16,30 +16,30 @@
 	pass
 
 _Enum_ipnl = {
-	'General Information panel' : 'gpnl',	# 
-	'Sharing panel' : 'spnl',	# 
-	'Memory panel' : 'mpnl',	# 
-	'Status and Configuration panel' : 'scnl',	# 
-	'Fonts panel' : 'fpnl',	# 
+	'General_Information_panel' : 'gpnl',	# 
+	'Sharing_panel' : 'spnl',	# 
+	'Memory_panel' : 'mpnl',	# 
+	'Status_and_Configuration_panel' : 'scnl',	# 
+	'Fonts_panel' : 'fpnl',	# 
 }
 
 _Enum_pple = {
-	'General Preferences panel' : 'pgnp',	# 
-	'Label Preferences panel' : 'plbp',	# 
-	'Icon View Preferences panel' : 'pivp',	# 
-	'Button View Preferences panel' : 'pbvp',	# 
-	'List View Preferences panel' : 'plvp',	# 
+	'General_Preferences_panel' : 'pgnp',	# 
+	'Label_Preferences_panel' : 'plbp',	# 
+	'Icon_View_Preferences_panel' : 'pivp',	# 
+	'Button_View_Preferences_panel' : 'pbvp',	# 
+	'List_View_Preferences_panel' : 'plvp',	# 
 }
 
 _Enum_earr = {
-	'not arranged' : 'narr',	# 
-	'snap to grid' : 'grda',	# 
-	'arranged by name' : 'nama',	# 
-	'arranged by modification date' : 'mdta',	# 
-	'arranged by creation date' : 'cdta',	# 
-	'arranged by size' : 'siza',	# 
-	'arranged by kind' : 'kina',	# 
-	'arranged by label' : 'laba',	# 
+	'not_arranged' : 'narr',	# 
+	'snap_to_grid' : 'grda',	# 
+	'arranged_by_name' : 'nama',	# 
+	'arranged_by_modification_date' : 'mdta',	# 
+	'arranged_by_creation_date' : 'cdta',	# 
+	'arranged_by_size' : 'siza',	# 
+	'arranged_by_kind' : 'kina',	# 
+	'arranged_by_label' : 'laba',	# 
 }
 
 _Enum_sodr = {
@@ -55,19 +55,19 @@
 
 _Enum_vwby = {
 	'conflicts' : 'cflc',	# 
-	'existing items' : 'exsi',	# 
-	'small icon' : 'smic',	# 
+	'existing_items' : 'exsi',	# 
+	'small_icon' : 'smic',	# 
 	'icon' : 'iimg',	# 
 	'name' : 'pnam',	# 
-	'modification date' : 'asmo',	# 
+	'modification_date' : 'asmo',	# 
 	'size' : 'ptsz',	# 
 	'kind' : 'kind',	# 
 	'comment' : 'comt',	# 
 	'label' : 'labi',	# 
 	'version' : 'vers',	# 
-	'creation date' : 'ascd',	# 
-	'small button' : 'smbu',	# 
-	'large button' : 'lgbu',	# 
+	'creation_date' : 'ascd',	# 
+	'small_button' : 'smbu',	# 
+	'large_button' : 'lgbu',	# 
 	'grid' : 'grid',	# 
 	'all' : 'kyal',	# 
 }
@@ -77,10 +77,19 @@
 	'FPU' : 'fpu ',	# 
 	'MMU' : 'mmu ',	# 
 	'hardware' : 'hdwr',	# 
-	'operating system' : 'os  ',	# 
-	'sound system' : 'snd ',	# 
-	'memory available' : 'lram',	# 
-	'memory installed' : 'ram ',	# 
+	'operating_system' : 'os  ',	# 
+	'sound_system' : 'snd ',	# 
+	'memory_available' : 'lram',	# 
+	'memory_installed' : 'ram ',	# 
+}
+
+_Enum_ese0 = {
+	'starting_up' : 'ese2',	# 
+	'running' : 'ese3',	# 
+	'rebuilding_desktop' : 'ese5',	# 
+	'copying' : 'ese4',	# 
+	'restarting' : 'ese6',	# 
+	'quitting' : 'ese7',	# 
 }
 
 
@@ -97,11 +106,12 @@
 }
 
 _enumdeclarations = {
-	'gsen' : _Enum_gsen,
-	'earr' : _Enum_earr,
-	'isiz' : _Enum_isiz,
-	'vwby' : _Enum_vwby,
-	'pple' : _Enum_pple,
-	'ipnl' : _Enum_ipnl,
 	'sodr' : _Enum_sodr,
+	'ipnl' : _Enum_ipnl,
+	'ese0' : _Enum_ese0,
+	'vwby' : _Enum_vwby,
+	'gsen' : _Enum_gsen,
+	'isiz' : _Enum_isiz,
+	'earr' : _Enum_earr,
+	'pple' : _Enum_pple,
 }
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py b/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py
index 5137594..24e963e 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Files_and_suitcases.py
@@ -1,7 +1,7 @@
 """Suite Files and suitcases: Classes representing files and suitcases
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -243,37 +243,37 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'clpf' : clipping,
-	'docf' : document_file,
-	'stcs' : suitcase,
-	'appf' : application_file,
-	'file' : file,
-	'fsut' : font_suitcase,
-	'pack' : package,
-	'dafi' : desk_accessory_file,
-	'alia' : alias_file,
-	'dsut' : desk_accessory_suitcase,
-	'inlf' : internet_location_file,
-	'fntf' : font_file,
 	'sndf' : sound_file,
+	'fntf' : font_file,
+	'inlf' : internet_location_file,
+	'clpf' : clipping,
+	'alia' : alias_file,
+	'dafi' : desk_accessory_file,
+	'dsut' : desk_accessory_suitcase,
+	'fsut' : font_suitcase,
+	'file' : file,
+	'appf' : application_file,
+	'stcs' : suitcase,
+	'docf' : document_file,
+	'pack' : package,
 }
 
 _propdeclarations = {
-	'orig' : original_item,
-	'pspd' : stationery,
-	'aslk' : locked,
-	'iloc' : location,
-	'mprt' : minimum_size,
-	'fcrt' : creator_type,
-	'c@#^' : _3c_Inheritance_3e_,
-	'asty' : file_type,
-	'hscr' : has_scripting_terminology,
-	'sprt' : suggested_size,
-	'appt' : preferred_size,
-	'isab' : accepts_high_level_events,
-	'snd ' : sound,
-	'ver2' : product_version,
 	'vers' : version,
+	'ver2' : product_version,
+	'snd ' : sound,
+	'appt' : preferred_size,
+	'sprt' : suggested_size,
+	'isab' : accepts_high_level_events,
+	'hscr' : has_scripting_terminology,
+	'asty' : file_type,
+	'c@#^' : _3c_Inheritance_3e_,
+	'fcrt' : creator_type,
+	'mprt' : minimum_size,
+	'pspd' : stationery,
+	'iloc' : location,
+	'aslk' : locked,
+	'orig' : original_item,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py b/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py
index 9c4b65e..d858466 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Finder_Basics.py
@@ -1,7 +1,7 @@
 """Suite Finder Basics: Commonly-used Finder commands and object classes
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -32,7 +32,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -51,7 +51,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -70,7 +70,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -89,7 +89,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -108,7 +108,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -134,7 +134,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -196,6 +196,10 @@
 	"""desktop - the desktop """
 	which = 'desk'
 	want = 'cdsk'
+class execution_state(aetools.NProperty):
+	"""execution state - the current execution state of the Finder """
+	which = 'exec'
+	want = 'ese0'
 class Finder_preferences(aetools.NProperty):
 	"""Finder preferences - Various preferences that apply to the Finder as a whole """
 	which = 'pfrp'
@@ -224,6 +228,7 @@
 #        element 'cwin' as ['indx', 'name']
 #        element 'cwnd' as ['indx', 'name']
 #        element 'iwnd' as ['indx', 'name']
+#        element 'vwnd' as ['indx', 'name']
 #        element 'lwnd' as ['indx', 'name']
 #        element 'dwnd' as ['indx', 'name']
 
@@ -285,6 +290,7 @@
 	'version' : version,
 	'about_this_computer' : about_this_computer,
 	'desktop' : desktop,
+	'execution_state' : execution_state,
 	'Finder_preferences' : Finder_preferences,
 }
 application._elemdict = {
@@ -312,6 +318,7 @@
 	'window' : Earlier_terms.window,
 	'container_window' : Earlier_terms.container_window,
 	'information_window' : Earlier_terms.information_window,
+	'view_options_window' : Window_classes.view_options_window,
 	'clipping_window' : Window_classes.clipping_window,
 	'content_space' : Window_classes.content_space,
 }
@@ -333,34 +340,35 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'spfl' : special_folders,
 	'capp' : application,
+	'spfl' : special_folders,
 }
 
 _propdeclarations = {
-	'amnu' : apple_menu_items_folder,
-	'extn' : extensions_folder,
-	'pnam' : name,
-	'fshr' : file_sharing,
-	'pcli' : clipboard,
-	'strt' : startup_items_folder,
-	'pref' : preferences_folder,
-	'pisf' : frontmost,
-	'pins' : insertion_location,
-	'pvis' : visible,
-	'abbx' : about_this_computer,
-	'temp' : temporary_items_folder,
-	'font' : fonts_folder,
-	'pfrp' : Finder_preferences,
-	'desk' : desktop,
-	'fsup' : sharing_starting_up,
-	'mfre' : largest_free_block,
-	'ctrl' : control_panels_folder,
-	'sele' : selection,
-	'shdf' : shutdown_items_folder,
-	'macs' : system_folder,
-	'ver2' : product_version,
 	'vers' : version,
+	'ver2' : product_version,
+	'pfrp' : Finder_preferences,
+	'exec' : execution_state,
+	'pins' : insertion_location,
+	'mfre' : largest_free_block,
+	'fsup' : sharing_starting_up,
+	'desk' : desktop,
+	'ctrl' : control_panels_folder,
+	'macs' : system_folder,
+	'font' : fonts_folder,
+	'abbx' : about_this_computer,
+	'shdf' : shutdown_items_folder,
+	'temp' : temporary_items_folder,
+	'pvis' : visible,
+	'sele' : selection,
+	'pisf' : frontmost,
+	'pref' : preferences_folder,
+	'strt' : startup_items_folder,
+	'pcli' : clipboard,
+	'fshr' : file_sharing,
+	'pnam' : name,
+	'extn' : extensions_folder,
+	'amnu' : apple_menu_items_folder,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py b/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py
index 742c51a..986ecba 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Finder_items.py
@@ -1,7 +1,7 @@
 """Suite Finder items: Commands used with file system items, and basic item definition
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -26,7 +26,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -51,7 +51,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -71,7 +71,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -91,7 +91,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -111,28 +111,34 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+	_argmap_put_away = {
+		'asking' : 'fask',
+	}
+
 	def put_away(self, _object, _attributes={}, **_arguments):
 		"""put away: Put away the specified object(s)
 		Required argument: the items to put away
+		Keyword argument asking: Specifies whether or not to present a dialog to confirm putting this item away.
 		Keyword argument _attributes: AppleEvent attribute dictionary
 		Returns: the object put away in its put-away location
 		"""
 		_code = 'fndr'
 		_subcode = 'ptwy'
 
-		if _arguments: raise TypeError, 'No optional args expected'
+		aetools.keysubst(_arguments, self._argmap_put_away)
 		_arguments['----'] = _object
 
+		aetools.enumsubst(_arguments, 'fask', _Enum_bool)
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -152,7 +158,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -172,7 +178,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -293,6 +299,7 @@
 }
 item._elemdict = {
 }
+_Enum_bool = None # XXXX enum bool not found!!
 
 #
 # Indices of types declared in this module
@@ -302,27 +309,27 @@
 }
 
 _propdeclarations = {
-	'iwnd' : information_window,
+	'posn' : position,
+	'kind' : kind,
+	'ptsz' : size,
+	'phys' : physical_size,
+	'dwnd' : content_space,
+	'pbnd' : bounds,
+	'issl' : selected,
+	'labi' : label_index,
+	'dscr' : description,
+	'comt' : comment,
+	'ctnr' : container,
+	'pidx' : index,
+	'iimg' : icon,
+	'ID  ' : id,
+	'cwin' : window,
+	'pnam' : name,
+	'ascd' : creation_date,
 	'cdis' : disk,
 	'asmo' : modification_date,
-	'ascd' : creation_date,
-	'pnam' : name,
-	'labi' : label_index,
-	'ID  ' : id,
-	'iimg' : icon,
-	'pidx' : index,
-	'dwnd' : content_space,
-	'cwin' : window,
-	'comt' : comment,
-	'dscr' : description,
 	'asdr' : folder,
-	'issl' : selected,
-	'pbnd' : bounds,
-	'ctnr' : container,
-	'phys' : physical_size,
-	'ptsz' : size,
-	'kind' : kind,
-	'posn' : position,
+	'iwnd' : information_window,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py b/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py
index 6dfd9c6..a30653d 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Obsolete_terms.py
@@ -1,7 +1,7 @@
 """Suite Obsolete terms: Terms that have been deprecated
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -175,31 +175,31 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'ccdv' : control_panel,
-	'iwnd' : information_window,
-	'ctnr' : container,
+	'qwnd' : status_window,
 	'capp' : application,
+	'swnd' : sharing_window,
+	'ccdv' : control_panel,
+	'prcs' : process,
+	'cobj' : item,
+	'file' : file,
 	'sctr' : sharable_container,
 	'cwnd' : container_window,
-	'prcs' : process,
-	'file' : file,
-	'cobj' : item,
-	'qwnd' : status_window,
-	'swnd' : sharing_window,
+	'ctnr' : container,
+	'iwnd' : information_window,
 }
 
 _propdeclarations = {
-	'crtd' : creation_date_obsolete,
-	'cfol' : folder_obsolete,
-	'ctnr' : container,
-	'cwnd' : container_window,
-	'pvwp' : view_preferences,
-	'swnd' : sharing_window,
-	'sctr' : sharable_container,
-	'cobj' : item,
-	'modd' : modification_date_obsolete,
-	'islk' : locked_obsolete,
 	'fitp' : file_type_obsolete,
+	'swnd' : sharing_window,
+	'cfol' : folder_obsolete,
+	'crtd' : creation_date_obsolete,
+	'islk' : locked_obsolete,
+	'modd' : modification_date_obsolete,
+	'sctr' : sharable_container,
+	'pvwp' : view_preferences,
+	'cwnd' : container_window,
+	'ctnr' : container,
+	'cobj' : item,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py b/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py
index 17e36dc..60d098d 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Process_classes.py
@@ -1,7 +1,7 @@
 """Suite Process classes: Classes representing processes that are running
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -120,26 +120,26 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'prcs' : process,
 	'pcda' : desk_accessory_process,
 	'pcap' : application_process,
-	'prcs' : process,
 }
 
 _propdeclarations = {
-	'revt' : accepts_remote_events,
-	'appf' : application_file,
-	'pnam' : name,
-	'file' : file,
-	'pusd' : partition_space_used,
-	'fcrt' : creator_type,
-	'c@#^' : _3c_Inheritance_3e_,
-	'asty' : file_type,
-	'hscr' : has_scripting_terminology,
-	'dafi' : desk_accessory_file,
-	'isab' : accepts_high_level_events,
-	'appt' : total_partition_size,
-	'pisf' : frontmost,
 	'pvis' : visible,
+	'pisf' : frontmost,
+	'appt' : total_partition_size,
+	'isab' : accepts_high_level_events,
+	'dafi' : desk_accessory_file,
+	'hscr' : has_scripting_terminology,
+	'asty' : file_type,
+	'c@#^' : _3c_Inheritance_3e_,
+	'fcrt' : creator_type,
+	'pusd' : partition_space_used,
+	'file' : file,
+	'pnam' : name,
+	'appf' : application_file,
+	'revt' : accepts_remote_events,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py
index ef2ad1b..1d16255 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms that most applications should support
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -10,7 +10,8 @@
 
 _code = 'CoRe'
 
-class Standard_Suite_Events:
+from StdSuites.Standard_Suite import *
+class Standard_Suite_Events(Standard_Suite_Events):
 
 	_argmap_open = {
 		'using' : 'usin',
@@ -33,7 +34,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -58,7 +59,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -77,7 +78,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -97,7 +98,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -123,7 +124,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -149,7 +150,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -170,7 +171,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -202,7 +203,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -223,7 +224,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -254,7 +255,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -289,7 +290,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -309,12 +310,14 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
+import AppleScript_Suite
+import AppleScript_Suite
 _Enum_list = None # XXXX enum list not found!!
 _Enum_bool = None # XXXX enum bool not found!!
 
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py b/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py
index b4d6037..a74c330 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Type_Definitions.py
@@ -1,7 +1,7 @@
 """Suite Type Definitions: Definitions of records used in scripting the Finder
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -221,46 +221,46 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'clbl' : label,
-	'ifam' : icon_family,
-	'alst' : alias_list,
 	'cprf' : preferences,
+	'alst' : alias_list,
+	'ifam' : icon_family,
+	'clbl' : label,
 }
 
 _propdeclarations = {
-	'ics#' : small_monochrome_icon_and_mask,
-	'scda' : shows_creation_date,
-	'uswg' : uses_wide_grid,
-	'sprg' : spring_open_folders,
-	'is32' : small_32_bit_icon,
-	'ICN#' : large_monochrome_icon_and_mask,
-	'cwin' : window,
-	'sdat' : shows_modification_date,
-	'iisz' : spatial_view_icon_size,
-	'barr' : button_view_arrangement,
-	'il32' : large_32_bit_icon,
-	'l8mk' : large_8_bit_mask,
-	'scom' : shows_comments,
-	'bisz' : button_view_icon_size,
-	'lisz' : list_view_icon_size,
-	'slbl' : shows_label,
-	'icl4' : large_4_bit_icon,
-	'usme' : uses_simple_menus,
-	'urdt' : uses_relative_dates,
-	'vfnt' : view_font,
-	'sfsz' : calculates_folder_sizes,
-	'pidx' : index,
-	'icl8' : large_8_bit_icon,
-	'ssiz' : shows_size,
-	'ics8' : small_8_bit_mask,
-	'colr' : color,
-	'svrs' : shows_version,
-	'pnam' : name,
-	'sknd' : shows_kind,
-	'vfsz' : view_font_size,
-	'iarr' : spatial_view_arrangement,
-	'ics4' : small_4_bit_icon,
 	'dela' : delay_before_springing,
+	'ics4' : small_4_bit_icon,
+	'iarr' : spatial_view_arrangement,
+	'barr' : button_view_arrangement,
+	'ics#' : small_monochrome_icon_and_mask,
+	'sknd' : shows_kind,
+	'svrs' : shows_version,
+	'colr' : color,
+	'ics8' : small_8_bit_mask,
+	'icl8' : large_8_bit_icon,
+	'sprg' : spring_open_folders,
+	'vfsz' : view_font_size,
+	'sfsz' : calculates_folder_sizes,
+	'l8mk' : large_8_bit_mask,
+	'vfnt' : view_font,
+	'urdt' : uses_relative_dates,
+	'usme' : uses_simple_menus,
+	'icl4' : large_4_bit_icon,
+	'slbl' : shows_label,
+	'lisz' : list_view_icon_size,
+	'scda' : shows_creation_date,
+	'bisz' : button_view_icon_size,
+	'pidx' : index,
+	'scom' : shows_comments,
+	'iisz' : spatial_view_icon_size,
+	'sdat' : shows_modification_date,
+	'cwin' : window,
+	'ICN#' : large_monochrome_icon_and_mask,
+	'is32' : small_32_bit_icon,
+	'pnam' : name,
+	'il32' : large_32_bit_icon,
+	'uswg' : uses_wide_grid,
+	'ssiz' : shows_size,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py b/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py
index 4986946..88e737b 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/Window_classes.py
@@ -1,7 +1,7 @@
 """Suite Window classes: Classes representing windows
 Level 1, version 1
 
-Generated from Macintosh HD:Systeemmap:Finder
+Generated from Moes:Systeemmap:Finder
 AETE/AEUT resource version 0/144, language 0, script 0
 """
 
@@ -50,8 +50,10 @@
 	"""modal - Is the window modal? """
 	which = 'pmod'
 	want = 'bool'
-
-resizable = titled
+class resizable(aetools.NProperty):
+	"""resizable - Is the window resizable? """
+	which = 'prsz'
+	want = 'bool'
 class zoomable(aetools.NProperty):
 	"""zoomable - Is the window zoomable? """
 	which = 'iszm'
@@ -227,6 +229,12 @@
 
 information_windows = information_window
 
+class view_options_window(aetools.ComponentItem):
+	"""view options window - A View Options window """
+	want = 'vwnd'
+
+view_options_windows = view_options_window
+
 class preferences_window(aetools.ComponentItem):
 	"""preferences window - The Finder Preferences window """
 	want = 'pwnd'
@@ -305,6 +313,12 @@
 }
 information_window._elemdict = {
 }
+view_options_window._propdict = {
+	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
+	'item' : item,
+}
+view_options_window._elemdict = {
+}
 preferences_window._propdict = {
 	'_3c_Inheritance_3e_' : _3c_Inheritance_3e_,
 	'current_panel' : current_panel,
@@ -325,63 +339,65 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
+	'pwnd' : preferences_window,
+	'vwnd' : view_options_window,
+	'cwin' : window,
+	'cwnd' : container_window,
 	'dwnd' : content_space,
 	'iwnd' : information_window,
 	'lwnd' : clipping_window,
-	'cwnd' : container_window,
-	'cwin' : window,
-	'pwnd' : preferences_window,
 }
 
 _propdeclarations = {
+	'prsz' : resizable,
+	'barr' : button_view_arrangement,
+	'pzum' : zoomed,
+	'iarr' : spatial_view_arrangement,
+	'hclb' : closeable,
+	'c@#^' : _3c_Inheritance_3e_,
+	'ver2' : product_version,
+	'sfsz' : calculates_folder_sizes,
+	'sprt' : suggested_size,
+	'zumf' : zoomed_full_size,
+	'urdt' : uses_relative_dates,
+	'panl' : current_panel,
+	'pmod' : modal,
+	'pspd' : stationery,
+	'scom' : shows_comments,
+	'appt' : preferred_size,
+	'aslk' : locked,
+	'pbnd' : bounds,
+	'iimg' : icon,
+	'mprt' : minimum_size,
+	'pnam' : name,
+	'ssiz' : shows_size,
+	'asmo' : modification_date,
+	'cobj' : item,
+	'ptit' : titled,
+	'posn' : position,
+	'cuss' : has_custom_view_settings,
+	'phys' : physical_size,
+	'sknd' : shows_kind,
+	'svrs' : shows_version,
+	'svew' : previous_list_view,
+	'comt' : comment,
+	'iszm' : zoomable,
+	'sord' : sort_direction,
+	'ascd' : creation_date,
+	'ctnr' : container,
+	'wshd' : collapsed,
+	'slbl' : shows_label,
+	'pull' : pulled_open,
+	'ptsz' : size,
+	'pvis' : visible,
 	'pidx' : index,
+	'isfl' : floating,
+	'warn' : warns_before_emptying,
+	'drwr' : popup,
+	'sdat' : shows_modification_date,
+	'pvew' : view,
 	'scda' : shows_creation_date,
 	'vers' : version,
-	'aslk' : locked,
-	'pvew' : view,
-	'sdat' : shows_modification_date,
-	'drwr' : popup,
-	'sprt' : suggested_size,
-	'pvis' : visible,
-	'ptsz' : size,
-	'pull' : pulled_open,
-	'slbl' : shows_label,
-	'wshd' : collapsed,
-	'ctnr' : container,
-	'ascd' : creation_date,
-	'warn' : warns_before_emptying,
-	'sord' : sort_direction,
-	'iszm' : zoomable,
-	'comt' : comment,
-	'svew' : previous_list_view,
-	'svrs' : shows_version,
-	'sknd' : shows_kind,
-	'phys' : physical_size,
-	'iarr' : spatial_view_arrangement,
-	'posn' : position,
-	'ptit' : titled,
-	'cobj' : item,
-	'asmo' : modification_date,
-	'ssiz' : shows_size,
-	'pnam' : name,
-	'pbnd' : bounds,
-	'mprt' : minimum_size,
-	'iimg' : icon,
-	'cuss' : has_custom_view_settings,
-	'appt' : preferred_size,
-	'scom' : shows_comments,
-	'pmod' : modal,
-	'panl' : current_panel,
-	'urdt' : uses_relative_dates,
-	'zumf' : zoomed_full_size,
-	'sfsz' : calculates_folder_sizes,
-	'c@#^' : _3c_Inheritance_3e_,
-	'isfl' : floating,
-	'hclb' : closeable,
-	'pspd' : stationery,
-	'pzum' : zoomed,
-	'barr' : button_view_arrangement,
-	'ver2' : product_version,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Finder/__init__.py b/Mac/Lib/lib-scriptpackages/Finder/__init__.py
index 9447dac..ede499b 100644
--- a/Mac/Lib/lib-scriptpackages/Finder/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/Finder/__init__.py
@@ -1,5 +1,5 @@
 """
-Package generated from Macintosh HD:Systeemmap:Finder
+Package generated from Moes:Systeemmap:Finder
 Resource aete resid 0 
 """
 import aetools
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py
index 57b61b3..c67b3ea 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Mozilla_suite.py
@@ -1,7 +1,7 @@
 """Suite Mozilla suite: Experimental Mozilla suite
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -33,7 +33,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -53,7 +53,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -79,7 +79,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -99,7 +99,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -118,7 +118,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -138,7 +138,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -158,7 +158,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -177,7 +177,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -197,7 +197,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -217,7 +217,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -240,13 +240,13 @@
 }
 
 _Enum_ncmd = {
-	'Get_new_mail' : '\000\000\004W',	# 
-	'Send_queued_messages' : '\000\000\004X',	# 
-	'Read_newsgroups' : '\000\000\004\004',	# 
-	'Show_Inbox' : '\000\000\004\005',	# 
-	'Show_Bookmarks_window' : '\000\000\004\006',	# 
-	'Show_History_window' : '\000\000\004\007',	# 
-	'Show_Address_Book_window' : '\000\000\004\011',	# 
+	'Get_new_mail' : '\x00\x00\x04W',	# 
+	'Send_queued_messages' : '\x00\x00\x04X',	# 
+	'Read_newsgroups' : '\x00\x00\x04\x04',	# 
+	'Show_Inbox' : '\x00\x00\x04\x05',	# 
+	'Show_Bookmarks_window' : '\x00\x00\x04\x06',	# 
+	'Show_History_window' : '\x00\x00\x04\x07',	# 
+	'Show_Address_Book_window' : '\x00\x00\x04\t',	# 
 }
 
 
@@ -263,7 +263,7 @@
 }
 
 _enumdeclarations = {
-	'dire' : _Enum_dire,
 	'comp' : _Enum_comp,
 	'ncmd' : _Enum_ncmd,
+	'dire' : _Enum_dire,
 }
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py b/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py
index b57086d..98672e5 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/PowerPlant.py
@@ -1,7 +1,7 @@
 """Suite PowerPlant: 
 Level 0, version 0
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -31,7 +31,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -55,17 +55,17 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
 			return _arguments['----']
 
 _Enum_dbac = {
-	'DoNothing' : '\000\000\000\000',	# No debugging action is taken.
-	'PostAlert' : '\000\000\000\001',	# Post an alert.
-	'LowLevelDebugger' : '\000\000\000\002',	# Break into the low level debugger (MacsBug).
-	'SourceDebugger' : '\000\000\000\003',	# Break into the source level debugger (if source debugger is executing).
+	'DoNothing' : '\x00\x00\x00\x00',	# No debugging action is taken.
+	'PostAlert' : '\x00\x00\x00\x01',	# Post an alert.
+	'LowLevelDebugger' : '\x00\x00\x00\x02',	# Break into the low level debugger (MacsBug).
+	'SourceDebugger' : '\x00\x00\x00\x03',	# Break into the source level debugger (if source debugger is executing).
 }
 
 
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py
index 90b37ff..b1a4f82 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Required_suite.py
@@ -1,7 +1,7 @@
 """Suite Required suite: 
 Level 0, version 0
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -27,7 +27,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -47,7 +47,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -66,7 +66,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -85,7 +85,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py
index 1044ca8..fd624a8 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Standard_Suite.py
@@ -1,7 +1,7 @@
 """Suite Standard Suite: Common terms for most applications
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -10,7 +10,8 @@
 
 _code = 'CoRe'
 
-class Standard_Suite_Events:
+from StdSuites.Standard_Suite import *
+class Standard_Suite_Events(Standard_Suite_Events):
 
 	def close(self, _object, _attributes={}, **_arguments):
 		"""close: Close an object
@@ -26,7 +27,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -47,7 +48,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -68,7 +69,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -93,7 +94,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -212,23 +213,23 @@
 }
 
 _propdeclarations = {
-	'ptit' : titled,
+	'prsz' : resizable,
+	'busy' : busy,
+	'KOSK' : kiosk_mode,
+	'pvis' : visible,
+	'hclb' : closeable,
+	'pmod' : modal,
+	'wiid' : unique_ID,
+	'pbnd' : bounds,
+	'iszm' : zoomable,
+	'ALAP' : alert_application,
 	'pidx' : index,
+	'isfl' : floating,
+	'pnam' : name,
 	'ppos' : position,
 	'curl' : URL,
-	'pnam' : name,
-	'pbnd' : bounds,
-	'isfl' : floating,
-	'hclb' : closeable,
-	'ALAP' : alert_application,
-	'iszm' : zoomable,
-	'pmod' : modal,
 	'pzum' : zoomed,
-	'pvis' : visible,
-	'KOSK' : kiosk_mode,
-	'busy' : busy,
-	'prsz' : resizable,
-	'wiid' : unique_ID,
+	'ptit' : titled,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py
index 1498c71..e0abd05 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Standard_URL_suite.py
@@ -4,7 +4,7 @@
 
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -39,7 +39,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/Text.py b/Mac/Lib/lib-scriptpackages/Netscape/Text.py
index beda5b3..50288d0 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/Text.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/Text.py
@@ -1,7 +1,7 @@
 """Suite Text: 
 Level 0, version 0
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -95,22 +95,22 @@
 # Indices of types declared in this module
 #
 _classdeclarations = {
-	'stys' : styleset,
 	'ctxt' : text,
+	'stys' : styleset,
 }
 
 _propdeclarations = {
-	'pAft' : justbehind,
-	'psct' : writing_code,
-	'txst' : style,
-	'colr' : color,
 	'pBef' : infront,
-	'pnam' : name,
+	'bgng' : beginning,
+	'colr' : color,
+	'txst' : style,
+	'psct' : writing_code,
+	'pAft' : justbehind,
+	'end ' : end,
 	'ptsz' : size,
 	'pUpL' : updateLevel,
-	'bgng' : beginning,
+	'pnam' : name,
 	'font' : font,
-	'end ' : end,
 }
 
 _compdeclarations = {
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py b/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
index c42505c..1c0c04f 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/WorldWideWeb_suite.py
@@ -1,7 +1,7 @@
 """Suite WorldWideWeb suite, as defined in Spyglass spec.: 
 Level 1, version 1
 
-Generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 AETE/AEUT resource version 1/0, language 0, script 0
 """
 
@@ -42,7 +42,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -72,7 +72,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -98,7 +98,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -123,7 +123,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -144,7 +144,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -164,7 +164,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -184,7 +184,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -205,7 +205,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -225,7 +225,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -245,7 +245,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -273,7 +273,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -299,7 +299,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -325,7 +325,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -351,7 +351,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -377,7 +377,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -403,7 +403,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/Netscape/__init__.py b/Mac/Lib/lib-scriptpackages/Netscape/__init__.py
index 38af429..4ce340c 100644
--- a/Mac/Lib/lib-scriptpackages/Netscape/__init__.py
+++ b/Mac/Lib/lib-scriptpackages/Netscape/__init__.py
@@ -1,8 +1,9 @@
 """
-Package generated from Macintosh HD:Internet:Internet-programma's:Netscape CommunicatorŽ-map:Netscape CommunicatorŽ
+Package generated from Moes:Applications (Mac OS 9):Netscape CommunicatorŽ Folder:Netscape CommunicatorŽ
 Resource aete resid 0 
 """
 import aetools
+Error = aetools.Error
 import Required_suite
 import Standard_Suite
 import Standard_URL_suite
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py
index 6f67fc3..f583991 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/AppleScript_Suite.py
@@ -25,7 +25,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -45,7 +45,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -64,7 +64,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -83,7 +83,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -103,7 +103,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -122,7 +122,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -141,7 +141,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -160,7 +160,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -191,7 +191,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -271,7 +271,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -292,7 +292,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -313,7 +313,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -334,7 +334,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -355,7 +355,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -376,7 +376,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -397,7 +397,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -418,7 +418,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -439,7 +439,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -460,7 +460,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -481,7 +481,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -502,7 +502,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -523,7 +523,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -544,7 +544,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -565,7 +565,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -586,7 +586,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -607,7 +607,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -628,7 +628,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -649,7 +649,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -670,7 +670,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -691,7 +691,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -712,7 +712,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -733,7 +733,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py b/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py
index 1eefb87..652824c 100644
--- a/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/StdSuites/Standard_Suite.py
@@ -27,7 +27,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -46,7 +46,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -65,7 +65,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -85,7 +85,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -110,7 +110,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -138,7 +138,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -164,7 +164,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -184,7 +184,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -212,7 +212,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -233,7 +233,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -264,7 +264,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -290,7 +290,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -317,7 +317,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -337,7 +337,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -363,7 +363,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -389,7 +389,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -415,7 +415,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -441,7 +441,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
diff --git a/Mac/Lib/lib-scriptpackages/_builtinSuites/builtin_Suite.py b/Mac/Lib/lib-scriptpackages/_builtinSuites/builtin_Suite.py
index 237dc15..117eedd 100644
--- a/Mac/Lib/lib-scriptpackages/_builtinSuites/builtin_Suite.py
+++ b/Mac/Lib/lib-scriptpackages/_builtinSuites/builtin_Suite.py
@@ -23,7 +23,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -42,7 +42,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -61,7 +61,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -81,7 +81,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):
@@ -106,7 +106,7 @@
 
 		_reply, _arguments, _attributes = self.send(_code, _subcode,
 				_arguments, _attributes)
-		if _arguments.has_key('errn'):
+		if _arguments.get('errn', 0):
 			raise aetools.Error, aetools.decodeerror(_arguments)
 		# XXXX Optionally decode result
 		if _arguments.has_key('----'):