Index: Include/system/enum.sbp
===================================================================
--- Include/system/enum.sbp	(revision 192)
+++ Include/system/enum.sbp	(revision 201)
@@ -6,4 +6,5 @@
 		m_Value=value
 	End Sub
+	
 	Sub ~EnumBase()
 	End Sub
@@ -19,35 +20,26 @@
 	End Function
 
-	Function Operator == (Value As Long) As Long
+	Function Operator == (Value As Long) As Boolean
 		If m_Value = Value Then
-			Return _System_TRUE
+			Return True
 		Else
-			Return _System_FALSE
+			Return False
 		End If
 	End Function
 
 	Function Operator or (ByRef value As EnumBase) As EnumBase
-		Dim returnValue As EnumBase
-		returnValue.m_Value = m_Value Or value.m_Value
-		Return returnValue
+		Return New EnumBase(m_Value Or value.m_Value)
 	End Function
 
-	
 	Function Operator and (ByRef value As EnumBase) As EnumBase
-		Dim returnValue As EnumBase
-		returnValue.m_Value = m_Value And value.m_Value
-		Return returnValue
+		Return New EnumBase(m_Value And value.m_Value)
 	End Function
-	
+
 	Function Operator not (ByRef value As EnumBase) As EnumBase
-		Dim returnValue As EnumBase
-		returnValue.m_Value = Not m_Value
-		Return returnValue
+		Return New EnumBase(Not m_Value)
 	End Function
-	
+
 	Function Operator xor (ByRef value As EnumBase) As EnumBase
-		Dim returnValue As EnumBase
-		returnValue.m_Value = m_Value Xor value.m_Value
-		Return returnValue
+		Return New EnumBase(m_Value Xor value.m_Value)
 	End Function
 End Class