Index: ModelGlue/gesture/eventhandler/EventHandler.cfc
===================================================================
--- ModelGlue/gesture/eventhandler/EventHandler.cfc	(revision 269)
+++ ModelGlue/gesture/eventhandler/EventHandler.cfc	(working copy)
@@ -13,12 +13,9 @@
 
 <cfset this.name = "" />
 <cfset this.access = "public" />
-<cfset this.messages = structNew() />
-<cfset this.messages.cfNullKeyWorkaround = arrayNew(1) />
-<cfset this.views = structNew() />
-<cfset this.views.cfNullKeyWorkaround = arrayNew(1) />
+<cfset this.messages = arrayNew(1) />
+<cfset this.views = arrayNew(1) />
 <cfset this.results = structNew() />
-<cfset this.results.cfNullKeyWorkaround = structNew() />
 <cfset this.cache = 0 />
 <cfset this.cacheKey = "" />
 <cfset this.cacheKeyValues = "" />
@@ -27,29 +24,19 @@
 
 <cffunction name="addMessage" returntype="ModelGlue.gesture.eventhandler.EventHandler" output="false" hint="Adds a Message and returns this.">
 	<cfargument name="message" type="ModelGlue.gesture.eventhandler.Message" />
-	<cfargument name="format" type="string" default="cfNullKeyWorkaround" />
-	
-	<cfif not structKeyExists(this.messages, arguments.format)>
-		<cfset this.messages[arguments.format] = arrayNew(1) />
-	</cfif>
 	
-	<cfset arrayAppend(this.messages[arguments.format], message) />
+	<cfset arrayAppend(this.messages, message) />
 
 	<cfreturn this />
 </cffunction>
 
 <cffunction name="hasMessage" access="public" returnType="boolean" output="false" hint="I state if a message already exists in this EventHandler.  Incurs a loop:  not a map lookup">
   <cfargument name="messagename" required="true" type="string">
-  <cfargument name="format" default="cfNullKeyWorkaround" type="string">
 	
 	<cfset var i = "" />
 	
-	<cfif not structKeyExists(this.messages, arguments.format)>
-		<cfset this.messages[arguments.format] = arrayNew(1) />
-	</cfif>
-	
-	<cfloop from="1" to="#arrayLen(this.messages[arguments.format])#" index="i">
-		<cfif this.messages[arguments.format][i].name eq messageName>
+	<cfloop from="1" to="#arrayLen(this.messages)#" index="i">
+		<cfif this.messages[i].name eq messageName>
 			<cfreturn true />
 		</cfif>
 	</cfloop>
@@ -59,48 +46,36 @@
 
 <cffunction name="addView" returntype="ModelGlue.gesture.eventhandler.EventHandler" output="false" hint="Adds a View and returns this.">
 	<cfargument name="view" type="ModelGlue.gesture.eventhandler.View" />
-  <cfargument name="format" default="cfNullKeyWorkaround" type="string">
 	
-	<cfif not structKeyExists(this.views, arguments.format)>
-		<cfset this.views[arguments.format] = arrayNew(1) />
-	</cfif>
-
-	<cfset arrayAppend(this.views[arguments.format], view) />
+	<cfset arrayAppend(this.views, view) />
 	
 	<cfreturn this />
 </cffunction>
 
 <cffunction name="addResult" returntype="ModelGlue.gesture.eventhandler.EventHandler" output="false" hint="Adds a Result and returns this.">
 	<cfargument name="result" type="ModelGlue.gesture.eventhandler.Result" />
-	<cfargument name="format" type="string" default="cfNullKeyWorkaround" />
 	
 	<cfif arguments.result.name eq "">
 		<cfset arguments.result.name = "cfNullKeyWorkaround" />
 	</cfif>
 	
-	<cfif not structKeyExists(this.results, arguments.format)>
-		<cfset this.results[arguments.format] = structNew() />
-	</cfif>
-	
-	<cfif not structKeyExists(this.results[arguments.format], arguments.result.name)>
-		<cfset this.results[arguments.format][arguments.result.name] = arrayNew(1) />
+	<cfif not structKeyExists(this.results, arguments.result.name)>
+		<cfset this.results[arguments.result.name] = arrayNew(1) />
 	</cfif>
 	
-	<cfset arrayAppend(this.results[arguments.format][arguments.result.name], result) />
+	<cfset arrayAppend(this.results[arguments.result.name], result) />
 	
 	<cfreturn this />
 </cffunction>
 
 <cffunction name="hasResult" access="public" returntype="boolean" output="false" hint="I state if any resMappings exist for the given result name.  Map lookup (fast operation).">
 	<cfargument name="name" required="true" type="string">
-	<cfargument name="format" required="false" default="cfNullKeyWorkaround" />
 	
-	<cfreturn structKeyExists(this.results, arguments.format) and structKeyExists(this.results[arguments.format], arguments.name) />
+	<cfreturn structKeyExists(this.results, arguments.name) />
 </cffunction>
 
 <cffunction name="resultMappingExists" access="public" returntype="boolean" output="false" hint="Deprecated for consistency:  use hasResult().">
 	<cfargument name="name" required="true" type="string">
-	<cfargument name="format" required="false" default="cfNullKeyWorkaround" />
 
 	<cfreturn hasResult(argumentCollection=arguments) />
 </cffunction>
Index: ModelGlue/gesture/eventhandler/Message.cfc
===================================================================
--- ModelGlue/gesture/eventhandler/Message.cfc	(revision 269)
+++ ModelGlue/gesture/eventhandler/Message.cfc	(working copy)
@@ -2,8 +2,10 @@
 
 <cfproperty name="name" type="string" hint="The name of the message." />
 <cfproperty name="arguments" type="ModelGlue.gesture.collections.MapCollection" hint="The collection of arguments associated with the message." />
+<cfproperty name="format" type="string" hint="The request format of the message." />
 
 <cfset this.name = "" />
 <cfset this.arguments = createObject("component", "ModelGlue.gesture.collections.MapCollection").init() />
+<cfset this.format = "" />
 
 </cfcomponent>
\ No newline at end of file
Index: ModelGlue/gesture/eventhandler/Result.cfc
===================================================================
--- ModelGlue/gesture/eventhandler/Result.cfc	(revision 269)
+++ ModelGlue/gesture/eventhandler/Result.cfc	(working copy)
@@ -6,6 +6,7 @@
 <cfproperty name="append" type="string" hint="If a redirect occurs, I'm a comma-delimited list of event values to append to the resultant url.">
 <cfproperty name="anchor" type="string" hint="If a redirect occurs, I'm the name of an event value containing a string to append as an anchor (index.cfm?event=foo##Anchor)">
 <cfproperty name="preserveState" default="true" type="boolean" hint="If a redirect takes place, should state be preserved?">
+<cfproperty name="format" type="string" hint="The request format of the message." />
 
 <cfset this.name = "" />
 <cfset this.event = "" />
@@ -13,5 +14,6 @@
 <cfset this.append = "" />
 <cfset this.anchor = "" />
 <cfset this.preserveState = true />
+<cfset this.format = "" />
 
 </cfcomponent>
\ No newline at end of file
Index: ModelGlue/gesture/eventhandler/View.cfc
===================================================================
--- ModelGlue/gesture/eventhandler/View.cfc	(revision 269)
+++ ModelGlue/gesture/eventhandler/View.cfc	(working copy)
@@ -8,6 +8,7 @@
 <cfproperty name="cacheKey" type="string" hint="Key by which this event-handler should be known in the cache.  Typically set by convention." />
 <cfproperty name="cacheKeyValues" type="string" hint="List of event values to append to the cache key." />
 <cfproperty name="cacheTimeout" type="numeric" hint="Number of seconds this event-handler should be cached." />
+<cfproperty name="format" type="string" hint="The request format of the message." />
 
 <cfset this.name = "" />
 <cfset this.values = structNew() />
@@ -17,6 +18,7 @@
 <cfset this.cacheKey = "" />
 <cfset this.cacheKeyValues = "" />
 <cfset this.cacheTimeout = 0 />
+<cfset this.format = "" />
 
 <cffunction name="addValue" returntype="ModelGlue.gesture.eventhandler.View" output="false" hint="Adds a Value and returns this.">
 	<cfargument name="value" type="ModelGlue.gesture.eventhandler.Value" />
Index: ModelGlue/gesture/eventhandler/test/TestEventHandler.cfc
===================================================================
--- ModelGlue/gesture/eventhandler/test/TestEventHandler.cfc	(revision 269)
+++ ModelGlue/gesture/eventhandler/test/TestEventHandler.cfc	(working copy)
@@ -48,7 +48,7 @@
 
 	<cfset eh.addMessage(message) />
 
-	<cfset assertTrue(arrayLen(eh.messages.cfNullKeyWorkaround), "messages should have a length after add")>	
+	<cfset assertTrue(arrayLen(eh.messages), "messages should have a length after add")>	
 	<cfset assertTrue(eh.hasMessage("message"), "hasMessage returned false after adding message!") />
 </cffunction>
 
@@ -62,7 +62,7 @@
 
 	<cfset eh.addResult(result) />
 	
-	<cfset assertTrue(structCount(eh.results.cfNullKeyWorkaround), "results should have length after add")>	
+	<cfset assertTrue(structCount(eh.results), "results should have length after add")>	
 	<cfset assertTrue(eh.hasResult("result"), "hasResult returned false after adding result!") />
 </cffunction>
 
@@ -70,7 +70,7 @@
 <cffunction name="testView_defaultProperties" returntype="void" access="public">
 	<cfset var view = createView() />
 	
-	<cfset assertFalse(view.append, "view should have apend=true by default")>	
+	<cfset assertFalse(view.append, "view should have append=true by default")>	
 	<cfset assertTrue(view.cache eq false) />
 	<cfset assertTrue(view.cacheKey eq "") />
 	<cfset assertTrue(view.cacheKeyValues eq "") />
@@ -85,7 +85,7 @@
 
 	<cfset eh.addView(view) />
 	
-	<cfset assertTrue(arrayLen(eh.views["cfNullKeyWorkaround"]), "views should have length before add")>	
+	<cfset assertTrue(arrayLen(eh.views), "views should have length before add")>	
 </cffunction>
 
 <cffunction name="testView_AddValue" returntype="void" access="public">
Index: ModelGlue/gesture/eventrequest/EventContext.cfc
===================================================================
--- ModelGlue/gesture/eventrequest/EventContext.cfc	(revision 269)
+++ ModelGlue/gesture/eventrequest/EventContext.cfc	(working copy)
@@ -281,108 +281,65 @@
 	<cfset variables._currentEventHandler = arguments.eventHandler />
 	
 	<cfset this.addTraceStatement("Event Handler", "Execute ""#arguments.eventHandler.name#""", "<event-handler name=""#arguments.eventHandler.name#"">") /> 
-	<!--- 
-		Invoke "" message broadcasts.  Code repeated for format, if necessary, to 
-		avoid string parsing - this is a per-request invocation!
-	--->
-	<cfloop from="1" to="#arrayLen(arguments.eventHandler.messages.cfNullKeyWorkaround)#" index="i">
-		<cfset message = arguments.eventHandler.messages.cfNullKeyWorkaround[i] />
+	
+	<!--- Invoke message broadcasts --->
+	<cfloop from="1" to="#arrayLen(arguments.eventHandler.messages)#" index="i">
+		<cfset message = arguments.eventHandler.messages[i] />
 		
-		<cfset variables._currentMessage = message />
-
-		<cfset this.addTraceStatement("Message Broadcast", "Broadcasting ""#message.name#""", "<message name=""#message.name#"">") /> 
-
-		<cfif structKeyExists(variables._listeners, message.name)>
-			<cfloop from="1" to="#arrayLen(variables._listeners[message.name])#" index="j">
-				<cfset this.addTraceStatement("Message Listener", "Invoking #variables._listeners[message.name][j].listenerFunction# in #getMetadata(variables._listeners[message.name][j].target).name#", "<message-listener message=""#message.name#"" function=""#variables._listeners[message.name][j].listenerFunction#"" />") /> 
-				<!---
-				<cfset variables._listeners[message.name][j].invokeListener(this) />
-				--->
-				<cfinvoke component="#variables._listeners[message.name][j].target#" method="#variables._listeners[message.name][j].listenerFunction#">
-					<cfinvokeargument name="event" value="#this#" />
-				</cfinvoke>
-			</cfloop>
-		</cfif>
-	</cfloop>
-	<cfif len(requestFormat) and structKeyExists(arguments.eventHandler.messages, requestFormat)>
-		<cfloop from="1" to="#arrayLen(arguments.eventHandler.messages[requestFormat])#" index="i">
-			<cfset message = arguments.eventHandler.messages[requestFormat][i] />
+		<cfif len(requestFormat) and (not len(message.format) or message.format is requestFormat)>
 			
 			<cfset variables._currentMessage = message />
-	
+			
 			<cfset this.addTraceStatement("Message Broadcast", "Broadcasting ""#message.name#""", "<message name=""#message.name#"">") /> 
-	
+			
 			<cfif structKeyExists(variables._listeners, message.name)>
 				<cfloop from="1" to="#arrayLen(variables._listeners[message.name])#" index="j">
 					<cfset this.addTraceStatement("Message Listener", "Invoking #variables._listeners[message.name][j].listenerFunction# in #getMetadata(variables._listeners[message.name][j].target).name#", "<message-listener message=""#message.name#"" function=""#variables._listeners[message.name][j].listenerFunction#"" />") /> 
+					<!---
 					<cfset variables._listeners[message.name][j].invokeListener(this) />
+					--->
+					<cfinvoke component="#variables._listeners[message.name][j].target#" method="#variables._listeners[message.name][j].listenerFunction#">
+						<cfinvokeargument name="event" value="#this#" />
+					</cfinvoke>
 				</cfloop>
 			</cfif>
-		</cfloop>
-	</cfif>
+			
+		</cfif>
+	</cfloop>
 		
 	<!--- Get, queue, and reset results. --->
 	<cfset results = getResults() />
 	
-	<!--- Queue explicit results: repetitive on purpose. --->
+	<!--- Queue explicit results. --->
 	<cfloop from="1" to="#arrayLen(results)#" index="i">
-		<cfif len(results[i]) and arguments.eventHandler.hasResult(results[i]) and isArray(arguments.eventHandler.results.cfNullKeyWorkaround[results[i]])>
-			<cfloop from="1" to="#arrayLen(arguments.eventHandler.results.cfNullKeyWorkaround[results[i]])#" index="j">
-				<cfset result = arguments.eventHandler.results.cfNullKeyWorkaround[results[i]][j] />
+		<cfif len(results[i]) and arguments.eventHandler.hasResult(results[i]) and isArray(arguments.eventHandler.results[results[i]])>
+			<cfloop from="1" to="#arrayLen(arguments.eventHandler.results[results[i]])#" index="j">
+				<cfset result = arguments.eventHandler.results[results[i]][j] />
 				
-				<cfif result.redirect>
-					<cfset this.addTraceStatement("Result", "Explicit result ""#result.name#"" added, redirecting to event event ""#result.event#""", "<result name=""#result.name#"" do=""#result.event#"" redirect=""#true#"" />") /> 
-					<cfset forward(eventName:result.event, preserveState:result.preserveState, addToken:false, append:result.append, anchor:result.anchor) />
-				<cfelse>
-					<cfset this.addTraceStatement("Result", "Explicit result ""#result.name#"" added, queueing event event ""#result.event#""", "<result name=""#result.name#"" do=""#result.event#"" />") /> 
-					<cfset addEventHandler(variables._eventHandlers[arguments.eventHandler.results.cfNullKeyWorkaround[results[i]][j].event]) />
-				</cfif>
-			</cfloop>
-		</cfif>
-	</cfloop>
-	<cfif len(requestFormat)>
-		
-		<cfloop from="1" to="#arrayLen(results)#" index="i">
-			<cfif len(results[i]) and arguments.eventHandler.hasResult(results[i], requestFormat) and isArray(arguments.eventHandler.results[requestFormat][results[i]])>
-				<cfloop from="1" to="#arrayLen(arguments.eventHandler.results[requestFormat][results[i]])#" index="j">
-					<cfset result = arguments.eventHandler.results[requestFormat][results[i]][j] />
+				<cfif len(requestFormat) and (not len(result.format) or result.format is requestFormat)>
 					
 					<cfif result.redirect>
 						<cfset this.addTraceStatement("Result", "Explicit result ""#result.name#"" added, redirecting to event event ""#result.event#""", "<result name=""#result.name#"" do=""#result.event#"" redirect=""#true#"" />") /> 
 						<cfset forward(eventName:result.event, preserveState:result.preserveState, addToken:false, append:result.append, anchor:result.anchor) />
 					<cfelse>
-						<cfset this.addTraceStatement("Result", "Explicit result ""#result.name#"" added, queing event ""#result.event#""", "<result name=""#result.name#"" do=""#result.event#"" />") /> 
-						<cfset addEventHandler(variables._eventHandlers[arguments.eventHandler.results[requestFormat][results[i]][j].event]) />
+						<cfset this.addTraceStatement("Result", "Explicit result ""#result.name#"" added, queueing event event ""#result.event#""", "<result name=""#result.name#"" do=""#result.event#"" />") /> 
+						<cfset addEventHandler(variables._eventHandlers[arguments.eventHandler.results[results[i]][j].event]) />
 					</cfif>
-				</cfloop>
-			</cfif>
-		</cfloop>
-	</cfif>
+					
+				</cfif>
+			</cfloop>
+		</cfif>
+	</cfloop>
 	
 	<!--- Queue implicit results --->
-	<cfif structKeyExists(arguments.eventHandler.results.cfNullKeyWorkaround, "cfNullKeyWorkaround") and isArray(arguments.eventHandler.results.cfNullKeyWorkaround.cfNullKeyWorkaround)>
-		<cfset results = arguments.eventHandler.results.cfNullKeyWorkaround.cfNullKeyWorkaround />
+	<cfif structKeyExists(arguments.eventHandler.results, "cfNullKeyWorkaround") and isArray(arguments.eventHandler.results.cfNullKeyWorkaround)>
+		<cfset results = arguments.eventHandler.results.cfNullKeyWorkaround />
 		
 		<cfloop from="1" to="#arrayLen(results)#" index="i">
 				<cfset result = results[i] />
-
-				<cfif result.redirect>
-					<cfset this.addTraceStatement("Result", "Implicit result redirecting to event ""#result.event#""", "<result do=""#result.event#"" redirect=""true"" />") /> 
-					<cfset forward(eventName:result.event, preserveState:result.preserveState, addToken:false, append:result.append, anchor:result.anchor) />
-				<cfelse>
-					<cfset this.addTraceStatement("Result", "Implicit result queing event ""#result.event#""", "<result do=""#result.event#"" />") /> 
-					<cfset addEventHandler(variables._eventHandlers[results[i].event]) />
-				</cfif>
-		</cfloop>
-	</cfif>
-	<cfif len(requestFormat) and structKeyExists(arguments.eventHandler.results, requestFormat)>
-		<cfif structKeyExists(arguments.eventHandler.results[requestFormat], "cfNullKeyWorkaround") 
-					and isArray(arguments.eventHandler.results[requestFormat].cfNullKeyWorkaround)>
-			<cfset results = arguments.eventHandler.results[requestFormat].cfNullKeyWorkaround />
-			
-			<cfloop from="1" to="#arrayLen(results)#" index="i">
-					<cfset result = results[i] />
-	
+				
+				<cfif len(requestFormat) and (not len(result.format) or result.format is requestFormat)>
+					
 					<cfif result.redirect>
 						<cfset this.addTraceStatement("Result", "Implicit result redirecting to event ""#result.event#""", "<result do=""#result.event#"" redirect=""true"" />") /> 
 						<cfset forward(eventName:result.event, preserveState:result.preserveState, addToken:false, append:result.append, anchor:result.anchor) />
@@ -390,22 +347,20 @@
 						<cfset this.addTraceStatement("Result", "Implicit result queing event ""#result.event#""", "<result do=""#result.event#"" />") /> 
 						<cfset addEventHandler(variables._eventHandlers[results[i].event]) />
 					</cfif>
-			</cfloop>
-		</cfif>
+					
+				</cfif>
+		</cfloop>
 	</cfif>
 		
 	<!--- Reset results --->
 	<cfset resetResults() />
 	
-	<!--- Queue views.  Repetitive on purpose - speed over elegance here. --->
-	<cfloop from="1" to="#arrayLen(arguments.eventHandler.views.cfNullKeyWorkaround)#" index="i">
-		<cfset queueView(arguments.eventHandler.views.cfNullKeyWorkaround[i]) />
+	<!--- Queue views.  --->
+	<cfloop from="1" to="#arrayLen(arguments.eventHandler.views)#" index="i">
+		<cfif len(requestFormat) and (not len(arguments.eventHandler.views[i].format) or arguments.eventHandler.views[i].format is requestFormat)>
+			<cfset queueView(arguments.eventHandler.views[i]) />
+		</cfif>
 	</cfloop>
-	<cfif len(requestFormat) and structKeyExists(arguments.eventHandler.views, requestFormat)>
-		<cfloop from="1" to="#arrayLen(arguments.eventHandler.views[requestFormat])#" index="i">
-			<cfset queueView(arguments.eventHandler.views[requestFormat][i]) />
-		</cfloop>
-	</cfif>
 </cffunction>
 
 <!--- EVENT KNOWLEDGE --->
@@ -470,8 +425,7 @@
 	<cfargument name="resultName" type="string" hint="The name of the result (e.g., ""formInvalid"" or the like) to add." />
 	
 	<cfset var results = getResults() />
-	<cfset var format = "" />
-	<cfset var formatList = listappend(getValue("requestFormat", ""),  "cfNullKeyWorkaround") />
+	<cfset var requestFormat = getValue("requestFormat", "") />
 	<cfset var i = "" />
 	<cfset var eh = getCurrentEventHandler() />
 	<cfset var result = "" />
@@ -479,18 +433,20 @@
 	
 	<cfset addTraceStatement("Message Listener", "A named result ""#arguments.resultName#"" has been added.") />
 	
-	<cfloop list="#formatList#" index="format">
-		<cfif structkeyexists(eh.results, format) AND structKeyExists(eh.results[format], arguments.resultName)>	
-			<cfloop from="1" to="#arrayLen(eh.results[format][arguments.resultName])#" index="i">
-				<cfset result = eh.results[format][arguments.resultName][i] />
+	<cfif structkeyexists(eh.results, arguments.resultName)>	
+		<cfloop from="1" to="#arrayLen(eh.results[arguments.resultName])#" index="i">
+			<cfset result = eh.results[arguments.resultName][i] />
+			
+			<cfif len(requestFormat) and (not len(result.format) or result.format is requestFormat)>
 				
 				<cfif result.redirect>
 					<cfset this.addTraceStatement("Result", "Explicit result redirecting to event ""#result.event#""", "<result do=""#result.event#"" redirect=""true"" />") /> 
 					<cfset forward(eventName:result.event, preserveState:result.preserveState, addToken:false, append:result.append, anchor:result.anchor) />
 				</cfif>
-			</cfloop>
-		</cfif>
-	</cfloop>
+				
+			</cfif>
+		</cfloop>
+	</cfif>
 	
 	<cfset arrayAppend(variables._results, arguments.resultName) />
 </cffunction>
Index: ModelGlue/gesture/eventrequest/test/TestEventContext.cfc
===================================================================
--- ModelGlue/gesture/eventrequest/test/TestEventContext.cfc	(revision 269)
+++ ModelGlue/gesture/eventrequest/test/TestEventContext.cfc	(working copy)
@@ -148,9 +148,10 @@
 	<cfset listener.listenerFunction = "listener_testExecuteEventHandler_ListenerInvocation_byFormat" />
 	<cfset msg = createMessage() />
 	<cfset msg.name = "explicitFormatMessage" />
+	<cfset msg.format = "explicitFormat" />
 	<cfset listeners[msg.name] = arrayNew(1) />
 	<cfset arrayAppend(listeners[msg.name], listener) />
-	<cfset eh1.addMessage(msg, "explicitFormat") />
+	<cfset eh1.addMessage(msg) />
 	
 	<cfset er = createEventContext() />
 	<cfset er.setListenerMap(listeners) />
@@ -278,17 +279,21 @@
 	<cfset listener1.target = this />
 	<cfset listener1.listenerFunction = "listener1_testExecuteEventHandler_ResultQueueing" />
 	<cfset msg1.name = "message1" />
+	<cfset msg1.format = "explicitFormat" />
 	<cfset makePublic(this,"listener1_testExecuteEventHandler_ResultQueueing") />
 	
 	<cfset listener2.target = this />
 	<cfset listener2.listenerFunction = "listener2_testExecuteEventHandler_ResultQueueing" />
 	<cfset msg2.name = "message2" />
+	<cfset msg2.format = "explicitFormat" />
 	<cfset makePublic(this,"listener2_testExecuteEventHandler_ResultQueueing") />
 	
 	<cfset listener3.target = this />
 	<cfset listener3.listenerFunction = "listener3_testExecuteEventHandler_ResultQueueing" />
 	<cfset msg3.name = "message3" />
-		<cfset makePublic(this,"listener3_testExecuteEventHandler_ResultQueueing") />
+	<cfset msg3.format = "explicitFormat" />
+	<cfset makePublic(this,"listener3_testExecuteEventHandler_ResultQueueing") />
+	
 	<cfset listeners[msg1.name] = arrayNew(1) />
 	<cfset listeners[msg2.name] = arrayNew(1) />
 	<cfset listeners[msg3.name] = arrayNew(1) />
@@ -299,21 +304,23 @@
 
 	<!--- Set up event handlers --->	
 	<cfset eh1.name = "eh1" />
-	<cfset eh1.addMessage(msg1, "explicitFormat") />
+	<cfset eh1.addMessage(msg1) />
 	<!--- Explicit result --->
 	<cfset result1.name = "result1" />
 	<cfset result1.event = "eh2" />
-	<cfset eh1.addResult(result1, "explicitFormat") />
+	<cfset result1.format = "explicitFormat" />
+	<cfset eh1.addResult(result1) />
 	<!--- Implicit result --->
 	<cfset result2.name = "" />
 	<cfset result2.event = "eh3" />
-	<cfset eh1.addResult(result2, "explicitFormat") />
+	<cfset result2.format = "explicitFormat" />
+	<cfset eh1.addResult(result2) />
 
 	<cfset eh2.name = "eh2" />
-	<cfset eh2.addMessage(msg2, "explicitFormat") />
+	<cfset eh2.addMessage(msg2) />
 
 	<cfset eh3.name = "eh3" />
-	<cfset eh3.addMessage(msg3, "explicitFormat") />
+	<cfset eh3.addMessage(msg3) />
 
 	<cfset eventHandlers[eh1.name] = eh1 />
 	<cfset eventHandlers[eh2.name] = eh2 />
@@ -379,10 +386,11 @@
 
 	<cfset formattedView.name = "testFormattedRenderView" />
 	<cfset formattedView.template = "testFormatView.cfm" />
+	<cfset formattedView.format = "explicitFormat" />
 
 	<cfset eh.name = "eh" />
 	<cfset eh.addView(view) />
-	<cfset eh.addView(formattedView, "explicitFormat") />
+	<cfset eh.addView(formattedView) />
 
 	<cfset ec = createEventContext() />
 	<cfset ec.setValue("viewContents", "testEventHandler_ViewRendering") />
@@ -567,6 +575,8 @@
 	<cfset ec = mg.handleRequest() />
 	
 	<cfset assertEquals( "home", ec.getInitialEventHandlerName(), "The requested event should be ""home"" " ) />
+	
+	<cfset structClear(url) />
 </cffunction>
 
 <cffunction name="testGetInitialEventHandlerNameForExplicitEvent" returntype="void" access="public">
@@ -584,6 +594,8 @@
 	<cfset ec = mg.handleRequest() />
 	
 	<cfset assertEquals( "test", ec.getInitialEventHandlerName(), "The requested event should be ""test"" " ) />
+	
+	<cfset structClear(url) />
 </cffunction>
 
 <!--- EVENT HANDLER EXTENSIBILITY TEST --->
@@ -601,6 +613,169 @@
 	
 	<cfset assertTrue( ec.exists("onRequestStart"), "The internal onRequestStart function was not invoked" ) />
 	<cfset assertTrue( ec.exists("customOnRequestStart"), "The custom onRequestStart function was not invoked" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<!--- FORMAT EXECUTION ORDER TESTS --->
+<cffunction name="testExecutionOrderOfMessageBroadcastWithFormat" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "broadcastEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "format,none", ec.getValue("messageFormats"), "The message with the format of ""format"" should be broadcast first" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfMessageBroadcastWithFormatFromEventType" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "typedBroadcastEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "format,none", ec.getValue("messageFormats"), "The message with the format of ""format"" should be broadcast first" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfImplicitResultQueuedWithFormat" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "resultEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "format,none", ec.getValue("messageFormats"), "The message with the format of ""format"" should be broadcast first" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfImplicitResultQueuedWithFormatFromEventType" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "typedResultEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "format,none", ec.getValue("messageFormats"), "The message with the format of ""format"" should be broadcast first" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfNamedResultQueuedWithFormat" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "namedResultEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "format,none", ec.getValue("messageFormats"), "The message with the format of ""format"" should be broadcast first" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfNamedResultQueuedWithFormatFromEventType" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "typedNamedResultEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "format,none", ec.getValue("messageFormats"), "The message with the format of ""format"" should be broadcast first" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfViewQueuedWithFormat" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "viewEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "none", ec.getViewCollection().getFinalView(), "The view with the content of ""none"" should be the final view" ) />
+	
+	<cfset structClear(url) />
+</cffunction>
+
+<cffunction name="testExecutionOrderOfViewQueuedWithFormatFromEventType" returntype="void" access="public">
+	<cfset var mg = createModelGlue(this.coldspringPath) />
+	<cfset var loader = "" />
+	<cfset var ec = "" />
+	
+	<cfset loader = mg.getInternalBean("modelglue.ModuleLoaderFactory").create("XML") />
+	<cfset loader.load(mg, "/ModelGlue/gesture/eventrequest/test/format/formatOrder.xml") />
+	
+	<cfset structClear(url) />
+	
+	<cfset url.event = "typedViewEvent" />
+	<cfset url.requestFormat = "format" />
+	
+	<cfset ec = mg.handleRequest() />
+	
+	<cfset assertEquals( "none", ec.getViewCollection().getFinalView(), "The view with the content of ""none"" should be the final view" ) />
+	
+	<cfset structClear(url) />
 </cffunction>
 
 </cfcomponent>
\ No newline at end of file
Index: ModelGlue/gesture/eventrequest/test/format/FormatController.cfc
===================================================================
--- ModelGlue/gesture/eventrequest/test/format/FormatController.cfc	(revision 0)
+++ ModelGlue/gesture/eventrequest/test/format/FormatController.cfc	(revision 0)
@@ -0,0 +1,35 @@
+<cfcomponent output="false" extends="ModelGlue.gesture.controller.Controller">
+
+<cffunction name="addNamedResult" access="public" output="false" returntype="void">
+	<cfargument name="event" type="any" required="true" />
+	
+	<cfset arguments.event.addResult("target") />
+</cffunction>
+
+<cffunction name="addFormatNamedResult" access="public" output="false" returntype="void">
+	<cfargument name="event" type="any" required="true" />
+	
+	<cfset arguments.event.addResult("formatTarget") />
+</cffunction>
+
+<cffunction name="message" access="public" output="false" returntype="void">
+	<cfargument name="event" type="any" required="true" />
+	
+	<cfset var messageFormats = arguments.event.getValue("messageFormats") />
+	
+	<cfset messageFormats = listAppend(messageFormats, "none") />
+	
+	<cfset arguments.event.setValue("messageFormats", messageFormats) />
+</cffunction>
+
+<cffunction name="formatMessage" access="public" output="false" returntype="void">
+	<cfargument name="event" type="any" required="true" />
+	
+	<cfset var messageFormats = arguments.event.getValue("messageFormats") />
+	
+	<cfset messageFormats = listAppend(messageFormats, "format") />
+	
+	<cfset arguments.event.setValue("messageFormats", messageFormats) />
+</cffunction>
+
+</cfcomponent>
\ No newline at end of file
Index: ModelGlue/gesture/eventrequest/test/format/formatOrder.xml
===================================================================
--- ModelGlue/gesture/eventrequest/test/format/formatOrder.xml	(revision 0)
+++ ModelGlue/gesture/eventrequest/test/format/formatOrder.xml	(revision 0)
@@ -0,0 +1,135 @@
+<modelglue>
+
+<config>
+
+	<setting name="viewMappings" value="/ModelGlue/gesture/eventrequest/test/format" />
+
+</config>
+
+<controllers>
+
+	<controller id="FormatController" type="ModelGlue.gesture.eventrequest.test.format.FormatController">
+		<message-listener message="addNamedResult" />
+		<message-listener message="addFormatNamedResult" />
+		<message-listener message="message" />
+		<message-listener message="formatMessage" />
+	</controller>
+
+</controllers>
+
+<event-types>
+
+	<event-type name="broadcastType">
+		<before>
+			<broadcasts format="format">
+				<message name="formatMessage" />
+			</broadcasts>
+		</before>
+	</event-type>
+
+	<event-type name="resultType">
+		<before>
+			<results format="format">
+				<result do="formatTargetEvent" />
+			</results>
+		</before>
+	</event-type>
+
+	<event-type name="namedResultType">
+		<before>
+			<broadcasts format="format">
+				<message name="addFormatNamedResult" />
+			</broadcasts>
+		</before>
+	</event-type>
+
+	<event-type name="viewType">
+		<before>
+			<views format="format">
+				<include name="view" template="formatView.cfm" />
+			</views>
+		</before>
+	</event-type>
+
+</event-types>
+
+<event-handlers>
+
+	<event-handler name="broadcastEvent">
+		<broadcasts format="format">
+			<message name="formatMessage" />
+		</broadcasts>
+		<broadcasts>
+			<message name="message" />
+		</broadcasts>
+	</event-handler>
+	<event-handler name="typedBroadcastEvent" type="broadcastType">
+		<broadcasts>
+			<message name="message" />
+		</broadcasts>
+	</event-handler>
+
+	<event-handler name="resultEvent">
+		<results format="format">
+			<result do="formatTargetEvent" />
+		</results>
+		<results>
+			<result do="targetEvent" />
+		</results>
+	</event-handler>
+	<event-handler name="typedResultEvent" type="resultType">
+		<results>
+			<result do="targetEvent" />
+		</results>
+	</event-handler>
+
+	<event-handler name="namedResultEvent">
+		<broadcasts format="format">
+			<message name="addFormatNamedResult" />
+		</broadcasts>
+		<broadcasts>
+			<message name="addNamedResult" />
+		</broadcasts>
+		<results>
+			<result name="target" do="targetEvent" />
+			<result name="formatTarget" do="formatTargetEvent" />
+		</results>
+	</event-handler>
+	<event-handler name="typedNamedResultEvent" type="namedResultType">
+		<broadcasts>
+			<message name="addNamedResult" />
+		</broadcasts>
+		<results>
+			<result name="target" do="targetEvent" />
+			<result name="formatTarget" do="formatTargetEvent" />
+		</results>
+	</event-handler>
+
+	<event-handler name="targetEvent">
+		<broadcasts>
+			<message name="message" />
+		</broadcasts>
+	</event-handler>
+	<event-handler name="formatTargetEvent">
+		<broadcasts>
+			<message name="formatMessage" />
+		</broadcasts>
+	</event-handler>
+
+	<event-handler name="viewEvent">
+		<views format="format">
+			<include name="view" template="formatView.cfm" />
+		</views>
+		<views>
+			<include name="view" template="view.cfm" />
+		</views>
+	</event-handler>
+	<event-handler name="typedViewEvent" type="viewType">
+		<views>
+			<include name="view" template="view.cfm" />
+		</views>
+	</event-handler>
+
+</event-handlers>
+
+</modelglue>
\ No newline at end of file
Index: ModelGlue/gesture/eventrequest/test/format/formatView.cfm
===================================================================
--- ModelGlue/gesture/eventrequest/test/format/formatView.cfm	(revision 0)
+++ ModelGlue/gesture/eventrequest/test/format/formatView.cfm	(revision 0)
@@ -0,0 +1 @@
+format
\ No newline at end of file
Index: ModelGlue/gesture/eventrequest/test/format/view.cfm
===================================================================
--- ModelGlue/gesture/eventrequest/test/format/view.cfm	(revision 0)
+++ ModelGlue/gesture/eventrequest/test/format/view.cfm	(revision 0)
@@ -0,0 +1 @@
+none
\ No newline at end of file
Index: ModelGlue/gesture/module/XMLModuleLoader.cfc
===================================================================
--- ModelGlue/gesture/module/XMLModuleLoader.cfc	(revision 269)
+++ ModelGlue/gesture/module/XMLModuleLoader.cfc	(working copy)
@@ -456,19 +456,18 @@
 	<cfloop from="1" to="#arrayLen(arguments.broadcastsXml.xmlChildren)#" index="i">
 		<cfset msgXml = arguments.broadcastsXml.xmlChildren[i] />
 		<cfset msgInst = createObject("component", "ModelGlue.gesture.eventhandler.Message") />
+		
+		<cfparam name="arguments.broadcastsXml.xmlAttributes.format" default="" />
 	
 		<cfset msgInst.name = msgXml.xmlAttributes.name />
+		<cfset msgInst.format = arguments.broadcastsXml.xmlAttributes.format />
 		
 		<cfloop from="1" to="#arrayLen(msgXml.xmlChildren)#" index="j">
 			<cfset argXml = msgXml.xmlChildren[j] />
 			<cfset msgInst.arguments.setValue(argXml.xmlAttributes.name, argXml.xmlAttributes.value) />
 		</cfloop>
 		
-		<cfif structKeyExists(arguments.broadcastsXml.xmlAttributes, "format")>
-			<cfset arguments.eventHandler.addMessage(msgInst, arguments.broadcastsXml.xmlAttributes.format) />
-		<cfelse>
-			<cfset arguments.eventHandler.addMessage(msgInst) />
-		</cfif>
+		<cfset arguments.eventHandler.addMessage(msgInst) />
 	</cfloop>
 </cffunction>
 
@@ -486,8 +485,11 @@
 	<cfloop from="1" to="#arrayLen(arguments.resultsXml.xmlChildren)#" index="i">
 		<cfset resXml = arguments.resultsXml.xmlChildren[i] />
 		<cfset resInst = createObject("component", "ModelGlue.gesture.eventhandler.Result") />
-
-			
+		
+		<cfparam name="arguments.resultsXml.xmlAttributes.format" default="" />
+		
+		<cfset resInst.format = arguments.resultsXml.xmlAttributes.format />
+		
 		<cfloop collection="#resXml.xmlAttributes#" item="j">
 			<cfswitch expression="#j#">
 				<cfcase value="do">
@@ -505,11 +507,7 @@
 			</cfswitch>
 		</cfloop>
 
-		<cfif structKeyExists(arguments.resultsXml.xmlAttributes, "format")>
-			<cfset arguments.eventHandler.addResult(resInst, arguments.resultsXml.xmlAttributes.format) />
-		<cfelse>
-			<cfset arguments.eventHandler.addResult(resInst) />
-		</cfif>
+		<cfset arguments.eventHandler.addResult(resInst) />
 	</cfloop>
 </cffunction>
 
@@ -564,9 +562,12 @@
 	<cfloop from="1" to="#arrayLen(arguments.viewsXml.xmlChildren)#" index="i">
 		<cfset viewXml = arguments.viewsXml.xmlChildren[i] />
 		<cfset viewInst = createObject("component", "ModelGlue.gesture.eventhandler.View") />
-	
+		
+		<cfparam name="arguments.viewsXml.xmlAttributes.format" default="" />
+		
 		<cfset viewInst.name = viewXml.xmlAttributes.name />
 		<cfset viewInst.template = viewXml.xmlAttributes.template />
+		<cfset viewInst.format = arguments.viewsXml.xmlAttributes.format />
 		
 		<cfparam name="viewXml.xmlAttributes.append" default="false" />
 		<cfparam name="viewXml.xmlAttributes.cache" default="false" />
@@ -603,11 +604,7 @@
 			<cfset viewInst.addValue(valueInst) />
 		</cfloop>
 
-		<cfif structKeyExists(arguments.viewsXml.xmlAttributes, "format")>
-			<cfset arguments.eventHandler.addView(viewInst, arguments.viewsXml.xmlAttributes.format) />
-		<cfelse>
-			<cfset arguments.eventHandler.addView(viewInst) />
-		</cfif>
+		<cfset arguments.eventHandler.addView(viewInst) />
 
 	</cfloop>
 </cffunction>
Index: ModelGlue/gesture/module/test/TestXMLModuleLoader.cfc
===================================================================
--- ModelGlue/gesture/module/test/TestXMLModuleLoader.cfc	(revision 269)
+++ ModelGlue/gesture/module/test/TestXMLModuleLoader.cfc	(working copy)
@@ -48,36 +48,36 @@
 	<cfset assertTrue(isObject(obj), "event handler not object!") />
 	
 	<!--- Messages --->
-	<cfset assertTrue(structCount(obj.messages) eq 1, "message not found or more than one message found") />
+	<cfset assertTrue(arrayLen(obj.messages) eq 1, "message not found or more than one message found") />
 
-	<cfset assertTrue(obj.messages.CFNULLKEYWORKAROUND[1].name eq "messageName", "message name not set") />
-	<cfset assertTrue(obj.messages.CFNULLKEYWORKAROUND[1].arguments.getValue("argumentName") eq "argumentValue", "argument value not set (result = '#obj.messages.CFNULLKEYWORKAROUND[1].arguments.getValue("argumentName")#')") />
+	<cfset assertTrue(obj.messages[1].name eq "messageName", "message name not set") />
+	<cfset assertTrue(obj.messages[1].arguments.getValue("argumentName") eq "argumentValue", "argument value not set (result = '#obj.messages[1].arguments.getValue("argumentName")#')") />
 
 
 	<!--- Results --->
-	<cfset assertTrue(structCount(obj.results.CFNULLKEYWORKAROUND) eq 2, "results not found or two results not found") />
-	<cfset assertTrue(arrayLen(obj.results.CFNULLKEYWORKAROUND.resultName) eq 1, "resultName result not  found or more than one result mapped") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND.resultName[1].event eq "eventName", "resultName event prop misdefined") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND.resultName[1].redirect, "resultName redirect prop misdefined") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND.resultName[1].append eq "appendValue", "resultName append prop misdefined") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND.resultName[1].anchor eq "anchorValue", "resultName anchor prop misdefined") />
-	<cfset assertFalse(obj.results.CFNULLKEYWORKAROUND.resultName[1].preservestate, "resultName preservestate prop misdefined") />
-	<cfset assertTrue(arrayLen(obj.results.CFNULLKEYWORKAROUND["CFNULLKEYWORKAROUND"]) eq 1, "implicit result result not  found or more than one result mapped") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND["CFNULLKEYWORKAROUND"][1].event eq "implicitEventName", "implicit result event prop misdefined") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND["CFNULLKEYWORKAROUND"][1].redirect, "implicit result redirect prop misdefined") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND["CFNULLKEYWORKAROUND"][1].append eq "appendValue", "implicit result append prop misdefined") />
-	<cfset assertTrue(obj.results.CFNULLKEYWORKAROUND["CFNULLKEYWORKAROUND"][1].anchor eq "anchorValue", "implicit result anchor prop misdefined") />
-	<cfset assertFalse(obj.results.CFNULLKEYWORKAROUND["CFNULLKEYWORKAROUND"][1].preservestate, "implicit result preservestate prop misdefined") />
+	<cfset assertTrue(structCount(obj.results) eq 2, "results not found or two results not found") />
+	<cfset assertTrue(arrayLen(obj.results.resultName) eq 1, "resultName result not  found or more than one result mapped") />
+	<cfset assertTrue(obj.results.resultName[1].event eq "eventName", "resultName event prop misdefined") />
+	<cfset assertTrue(obj.results.resultName[1].redirect, "resultName redirect prop misdefined") />
+	<cfset assertTrue(obj.results.resultName[1].append eq "appendValue", "resultName append prop misdefined") />
+	<cfset assertTrue(obj.results.resultName[1].anchor eq "anchorValue", "resultName anchor prop misdefined") />
+	<cfset assertFalse(obj.results.resultName[1].preservestate, "resultName preservestate prop misdefined") />
+	<cfset assertTrue(arrayLen(obj.results["CFNULLKEYWORKAROUND"]) eq 1, "implicit result result not  found or more than one result mapped") />
+	<cfset assertTrue(obj.results["CFNULLKEYWORKAROUND"][1].event eq "implicitEventName", "implicit result event prop misdefined") />
+	<cfset assertTrue(obj.results["CFNULLKEYWORKAROUND"][1].redirect, "implicit result redirect prop misdefined") />
+	<cfset assertTrue(obj.results["CFNULLKEYWORKAROUND"][1].append eq "appendValue", "implicit result append prop misdefined") />
+	<cfset assertTrue(obj.results["CFNULLKEYWORKAROUND"][1].anchor eq "anchorValue", "implicit result anchor prop misdefined") />
+	<cfset assertFalse(obj.results["CFNULLKEYWORKAROUND"][1].preservestate, "implicit result preservestate prop misdefined") />
 	
 	<!--- Views --->
-	<cfset assertTrue(arrayLen(obj.views.CFNULLKEYWORKAROUND) eq 1, "view not found or more than one view found") />
-	<cfset assertTrue(obj.views.CFNULLKEYWORKAROUND[1].name eq "viewName", "view name not set") />
-	<cfset assertTrue(obj.views.CFNULLKEYWORKAROUND[1].template eq "templateName", "view template not set") />
-	<cfset assertTrue(structCount(obj.views.CFNULLKEYWORKAROUND[1].values) eq 1, "number of values is not one") />
-	<cfset assertTrue(structKeyExists(obj.views.CFNULLKEYWORKAROUND[1].values, "valueName"), "value named ""valuename"" not found") />
-	<cfset assertTrue(obj.views.CFNULLKEYWORKAROUND[1].values.valueName.name eq "valueName", "valueName value not named valueName (ugh, that's confusing.)") />	
-	<cfset assertTrue(obj.views.CFNULLKEYWORKAROUND[1].values.valueName.value eq "valueValue", "valueName value not set to valueValue") />	
-	<cfset assertFalse(obj.views.CFNULLKEYWORKAROUND[1].values.valueName.overwrite eq "valueValue", "valueName value wasn't set to not overwrite") />	
+	<cfset assertTrue(arrayLen(obj.views) eq 1, "view not found or more than one view found") />
+	<cfset assertTrue(obj.views[1].name eq "viewName", "view name not set") />
+	<cfset assertTrue(obj.views[1].template eq "templateName", "view template not set") />
+	<cfset assertTrue(structCount(obj.views[1].values) eq 1, "number of values is not one") />
+	<cfset assertTrue(structKeyExists(obj.views[1].values, "valueName"), "value named ""valuename"" not found") />
+	<cfset assertTrue(obj.views[1].values.valueName.name eq "valueName", "valueName value not named valueName (ugh, that's confusing.)") />	
+	<cfset assertTrue(obj.views[1].values.valueName.value eq "valueValue", "valueName value not set to valueValue") />	
+	<cfset assertFalse(obj.views[1].values.valueName.overwrite eq "valueValue", "valueName value wasn't set to not overwrite") />	
 	
 </cffunction>
 
Index: ModelGlue/gesture/modules/internal/utility/test/TestUtilityModule.cfc
===================================================================
--- ModelGlue/gesture/modules/internal/utility/test/TestUtilityModule.cfc	(revision 269)
+++ ModelGlue/gesture/modules/internal/utility/test/TestUtilityModule.cfc	(working copy)
@@ -35,6 +35,7 @@
 	<cfset url.event = "eventHandlerWithEventTypeOfDisabledDebug" />
 	<cfset ec = mg.handleRequest() />
 	<cfset assertTrue( request.modelGlueSuppressDebugging IS true, "Disable Debug setting did not work when event type had modelglue.disableModelGlueDebugging broadcast ") />
+	<cfset structClear(url) />	
 	
 	<!--- If we don't throw error, we made it. --->
 </cffunction>
Index: ModelGlue/gesture/test/TestModelGlue.cfc
===================================================================
--- ModelGlue/gesture/test/TestModelGlue.cfc	(revision 269)
+++ ModelGlue/gesture/test/TestModelGlue.cfc	(working copy)
@@ -80,7 +80,9 @@
 	<cfset assertTrue(context.getValue("someFormKey") eq "someFormValue", "form value not populated") />
 	<cfset assertTrue(context.getValue("someUrlKey") eq "someUrlValue", "form value not populated") />
 	<cfset assertTrue(context.getValue("conflictKey") eq "formConflictValue", "conflict value not recognized from form") />
-		
+	
+	<cfset structClear(url) />
+	<cfset structClear(form) />
 </cffunction>
 
 <cffunction name="testPhase_StatefulRedirectPopulation" returntype="void" access="public">
@@ -99,6 +101,9 @@
 	<cfset assertTrue(context.getValue("preservedValueName") eq "preservedValue", "preserved value not populated") />
 	<cfset assertFalse(structKeyExists(session, "_modelgluePreservedState"), "preserved state not cleared") />
 	<cfset assertTrue(context.getValue("conflictKey") eq "formConflictValue", "conflict value not recognized from form") />
+
+	<cfset structClear(form) />
+	<cfset structClear(url) />
 </cffunction>
 
 </cfcomponent>
\ No newline at end of file