diff --git a/Nuclex.Support (PC).csproj b/Nuclex.Support (PC).csproj
index e65c43f..71a9d57 100644
--- a/Nuclex.Support (PC).csproj	
+++ b/Nuclex.Support (PC).csproj	
@@ -300,4 +300,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Source/Collections/ObservableCollection.Test.cs b/Source/Collections/ObservableCollection.Test.cs
index 7ac172c..6f395d7 100644
--- a/Source/Collections/ObservableCollection.Test.cs
+++ b/Source/Collections/ObservableCollection.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Collections/ObservableCollection.cs b/Source/Collections/ObservableCollection.cs
index 0022b0e..01371b1 100644
--- a/Source/Collections/ObservableCollection.cs
+++ b/Source/Collections/ObservableCollection.cs
@@ -17,42 +17,20 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
 namespace Nuclex.Support.Collections {
 
-  /// <summary>Generic collection of progressions</summary>
+  /// <summary>Collection which fires events when items are added or removed</summary>
   public class ObservableCollection<ItemType> : Collection<ItemType> {
 
-    #region class ItemEventArgs
-
-    /// <summary>Arguments class for events that need to pass a progression</summary>
-    public class ItemEventArgs : EventArgs {
-
-      /// <summary>Initializes a new event arguments supplier</summary>
-      /// <param name="item">Item to be supplied to the event handler</param>
-      public ItemEventArgs(ItemType item) {
-        this.item = item;
-      }
-
-      /// <summary>Obtains the collection item the event arguments are carrying</summary>
-      public ItemType Item {
-        get { return this.item; }
-      }
-
-      /// <summary>Item that's passed to the event handler</summary>
-      private ItemType item;
-
-    }
-
-    #endregion // class ItemEventArgs
-
     /// <summary>Raised when an item has been added to the collection</summary>
-    public event EventHandler<ItemEventArgs> ItemAdded;
+    public event EventHandler<ItemEventArgs<ItemType>> ItemAdded;
     /// <summary>Raised when an item is removed from the collection</summary>
-    public event EventHandler<ItemEventArgs> ItemRemoved;
+    public event EventHandler<ItemEventArgs<ItemType>> ItemRemoved;
     /// <summary>Raised the collection is about to be cleared</summary>
     public event EventHandler Clearing;
 
@@ -122,14 +100,14 @@ namespace Nuclex.Support.Collections {
     /// <param name="item">Item that has been added to the collection</param>
     protected virtual void OnAdded(ItemType item) {
       if(ItemAdded != null)
-        ItemAdded(this, new ItemEventArgs(item));
+        ItemAdded(this, new ItemEventArgs<ItemType>(item));
     }
 
     /// <summary>Fires the 'ItemRemoved' event</summary>
     /// <param name="item">Item that has been removed from the collection</param>
     protected virtual void OnRemoved(ItemType item) {
       if(ItemRemoved != null)
-        ItemRemoved(this, new ItemEventArgs(item));
+        ItemRemoved(this, new ItemEventArgs<ItemType>(item));
     }
 
     /// <summary>Fires the 'Clearing' event</summary>
diff --git a/Source/Collections/Parentable.cs b/Source/Collections/Parentable.cs
index c784a96..cc17891 100644
--- a/Source/Collections/Parentable.cs
+++ b/Source/Collections/Parentable.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Collections/ParentingCollection.cs b/Source/Collections/ParentingCollection.cs
index d3b8891..150a17f 100644
--- a/Source/Collections/ParentingCollection.cs
+++ b/Source/Collections/ParentingCollection.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Source/Collections/PriorityQueue.Test.cs b/Source/Collections/PriorityQueue.Test.cs
index 95411a2..c24e908 100644
--- a/Source/Collections/PriorityQueue.Test.cs
+++ b/Source/Collections/PriorityQueue.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Collections/PriorityQueue.cs b/Source/Collections/PriorityQueue.cs
index dee0fab..1519fcd 100644
--- a/Source/Collections/PriorityQueue.cs
+++ b/Source/Collections/PriorityQueue.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Collections;
diff --git a/Source/Collections/RingMemoryStream.Test.cs b/Source/Collections/RingMemoryStream.Test.cs
index 166bef9..eb298e5 100644
--- a/Source/Collections/RingMemoryStream.Test.cs
+++ b/Source/Collections/RingMemoryStream.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 
 #if UNITTEST
diff --git a/Source/Collections/RingMemoryStream.cs b/Source/Collections/RingMemoryStream.cs
index fde2945..0d029d0 100644
--- a/Source/Collections/RingMemoryStream.cs
+++ b/Source/Collections/RingMemoryStream.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.IO;
 
diff --git a/Source/Collections/UnintrusivePriorityQueue.Test.cs b/Source/Collections/UnintrusivePriorityQueue.Test.cs
index 8b457a5..148b1ab 100644
--- a/Source/Collections/UnintrusivePriorityQueue.Test.cs
+++ b/Source/Collections/UnintrusivePriorityQueue.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Licensing/LicenseKey.Test.cs b/Source/Licensing/LicenseKey.Test.cs
index d4f08f7..112942a 100644
--- a/Source/Licensing/LicenseKey.Test.cs
+++ b/Source/Licensing/LicenseKey.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections;
 
diff --git a/Source/Licensing/LicenseKey.cs b/Source/Licensing/LicenseKey.cs
index dcbe5f6..38d2a33 100644
--- a/Source/Licensing/LicenseKey.cs
+++ b/Source/Licensing/LicenseKey.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections;
 using System.IO;
diff --git a/Source/Packing/ArevaloRectanglePacker.Test.cs b/Source/Packing/ArevaloRectanglePacker.Test.cs
index eb18bda..47f4bb5 100644
--- a/Source/Packing/ArevaloRectanglePacker.Test.cs
+++ b/Source/Packing/ArevaloRectanglePacker.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Packing/ArevaloRectanglePacker.cs b/Source/Packing/ArevaloRectanglePacker.cs
index 9bfeed3..433ab5a 100644
--- a/Source/Packing/ArevaloRectanglePacker.cs
+++ b/Source/Packing/ArevaloRectanglePacker.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Packing/CygonRectanglePacker.Test.cs b/Source/Packing/CygonRectanglePacker.Test.cs
index 46acceb..b098572 100644
--- a/Source/Packing/CygonRectanglePacker.Test.cs
+++ b/Source/Packing/CygonRectanglePacker.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Packing/CygonRectanglePacker.cs b/Source/Packing/CygonRectanglePacker.cs
index 5adf40c..b9817d4 100644
--- a/Source/Packing/CygonRectanglePacker.cs
+++ b/Source/Packing/CygonRectanglePacker.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Packing/RectanglePacker.Test.cs b/Source/Packing/RectanglePacker.Test.cs
index 91395c9..20c09d4 100644
--- a/Source/Packing/RectanglePacker.Test.cs
+++ b/Source/Packing/RectanglePacker.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Packing/SimpleRectanglePacker.Test.cs b/Source/Packing/SimpleRectanglePacker.Test.cs
index 9784e53..e9ad060 100644
--- a/Source/Packing/SimpleRectanglePacker.Test.cs
+++ b/Source/Packing/SimpleRectanglePacker.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Packing/SimpleRectanglePacker.cs b/Source/Packing/SimpleRectanglePacker.cs
index 1396fca..56abb53 100644
--- a/Source/Packing/SimpleRectanglePacker.cs
+++ b/Source/Packing/SimpleRectanglePacker.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Scheduling/AbortedException.cs b/Source/Scheduling/AbortedException.cs
index 160c234..5e730f9 100644
--- a/Source/Scheduling/AbortedException.cs
+++ b/Source/Scheduling/AbortedException.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Scheduling/IAbortable.cs b/Source/Scheduling/IAbortable.cs
index f52a5ee..b054de0 100644
--- a/Source/Scheduling/IAbortable.cs
+++ b/Source/Scheduling/IAbortable.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Scheduling/Operation.cs b/Source/Scheduling/Operation.cs
index 9d6c183..33bbbe6 100644
--- a/Source/Scheduling/Operation.cs
+++ b/Source/Scheduling/Operation.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Scheduling/QueueOperation.Test.cs b/Source/Scheduling/QueueOperation.Test.cs
index d7893c3..1ed8924 100644
--- a/Source/Scheduling/QueueOperation.Test.cs
+++ b/Source/Scheduling/QueueOperation.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Source/Scheduling/QueueOperation.cs b/Source/Scheduling/QueueOperation.cs
index 5106c5e..d237862 100644
--- a/Source/Scheduling/QueueOperation.cs
+++ b/Source/Scheduling/QueueOperation.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Scheduling/ThreadCallbackOperation.cs b/Source/Scheduling/ThreadCallbackOperation.cs
index 32c259b..400b899 100644
--- a/Source/Scheduling/ThreadCallbackOperation.cs
+++ b/Source/Scheduling/ThreadCallbackOperation.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/Source/Scheduling/ThreadOperation.cs b/Source/Scheduling/ThreadOperation.cs
index 7588307..5ec6f12 100644
--- a/Source/Scheduling/ThreadOperation.cs
+++ b/Source/Scheduling/ThreadOperation.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Threading;
diff --git a/Source/Serialization/BinarySerializer.Test.cs b/Source/Serialization/BinarySerializer.Test.cs
index 267c843..cabac5e 100644
--- a/Source/Serialization/BinarySerializer.Test.cs
+++ b/Source/Serialization/BinarySerializer.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Source/Serialization/BinarySerializer.cs b/Source/Serialization/BinarySerializer.cs
index 4683633..65ff85f 100644
--- a/Source/Serialization/BinarySerializer.cs
+++ b/Source/Serialization/BinarySerializer.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Source/Serialization/IBinarySerializable.cs b/Source/Serialization/IBinarySerializable.cs
index df69f65..c665fb7 100644
--- a/Source/Serialization/IBinarySerializable.cs
+++ b/Source/Serialization/IBinarySerializable.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Source/SpatialPartitioning/BoundingRectangle.cs b/Source/SpatialPartitioning/BoundingRectangle.cs
index 7ecfdc6..b10d29a 100644
--- a/Source/SpatialPartitioning/BoundingRectangle.cs
+++ b/Source/SpatialPartitioning/BoundingRectangle.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/SpatialPartitioning/RTree2.cs b/Source/SpatialPartitioning/RTree2.cs
index 56527fe..76118bc 100644
--- a/Source/SpatialPartitioning/RTree2.cs
+++ b/Source/SpatialPartitioning/RTree2.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/SpatialPartitioning/RTreeLeaf2.cs b/Source/SpatialPartitioning/RTreeLeaf2.cs
index f76129d..8c0a715 100644
--- a/Source/SpatialPartitioning/RTreeLeaf2.cs
+++ b/Source/SpatialPartitioning/RTreeLeaf2.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Source/SpatialPartitioning/RTreeNode2.cs b/Source/SpatialPartitioning/RTreeNode2.cs
index 15d65f1..5df3d5a 100644
--- a/Source/SpatialPartitioning/RTreeNode2.cs
+++ b/Source/SpatialPartitioning/RTreeNode2.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
diff --git a/Source/SpatialPartitioning/SpatialIndex2.cs b/Source/SpatialPartitioning/SpatialIndex2.cs
index 7e3c5f6..9596462 100644
--- a/Source/SpatialPartitioning/SpatialIndex2.cs
+++ b/Source/SpatialPartitioning/SpatialIndex2.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 
diff --git a/Source/Tracking/IdleStateEventArgs.cs b/Source/Tracking/IdleStateEventArgs.cs
index dc80fdd..9a42536 100644
--- a/Source/Tracking/IdleStateEventArgs.cs
+++ b/Source/Tracking/IdleStateEventArgs.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Source/Tracking/Internal/ObservedWeightedProgression.cs b/Source/Tracking/Internal/ObservedWeightedProgression.cs
index f971df5..ffd0a44 100644
--- a/Source/Tracking/Internal/ObservedWeightedProgression.cs
+++ b/Source/Tracking/Internal/ObservedWeightedProgression.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Source/Tracking/Internal/WeightedProgressionWrapperCollection.cs b/Source/Tracking/Internal/WeightedProgressionWrapperCollection.cs
index dc556d5..51bda13 100644
--- a/Source/Tracking/Internal/WeightedProgressionWrapperCollection.cs
+++ b/Source/Tracking/Internal/WeightedProgressionWrapperCollection.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
diff --git a/Source/Tracking/ProgressUpdateEventArgs.cs b/Source/Tracking/ProgressUpdateEventArgs.cs
index 1dbc208..f79318c 100644
--- a/Source/Tracking/ProgressUpdateEventArgs.cs
+++ b/Source/Tracking/ProgressUpdateEventArgs.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Source/Tracking/Progression.cs b/Source/Tracking/Progression.cs
index f3e5593..99080e3 100644
--- a/Source/Tracking/Progression.cs
+++ b/Source/Tracking/Progression.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Threading;
 
diff --git a/Source/Tracking/ProgressionTracker.Test.cs b/Source/Tracking/ProgressionTracker.Test.cs
index 86da6c9..413a64c 100644
--- a/Source/Tracking/ProgressionTracker.Test.cs
+++ b/Source/Tracking/ProgressionTracker.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Source/Tracking/SetProgression.Test.cs b/Source/Tracking/SetProgression.Test.cs
index 6f74763..9d794f4 100644
--- a/Source/Tracking/SetProgression.Test.cs
+++ b/Source/Tracking/SetProgression.Test.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/Source/Tracking/SetProgression.cs b/Source/Tracking/SetProgression.cs
index 8834191..099c867 100644
--- a/Source/Tracking/SetProgression.cs
+++ b/Source/Tracking/SetProgression.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
diff --git a/Source/Tracking/WeightedProgression.cs b/Source/Tracking/WeightedProgression.cs
index 791dca7..b4442ef 100644
--- a/Source/Tracking/WeightedProgression.cs
+++ b/Source/Tracking/WeightedProgression.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Text;
diff --git a/Source/WeakReference.cs b/Source/WeakReference.cs
index 302a029..28c427e 100644
--- a/Source/WeakReference.cs
+++ b/Source/WeakReference.cs
@@ -17,6 +17,7 @@ You should have received a copy of the IBM Common Public
 License along with this library
 */
 #endregion
+
 using System;
 using System.Collections.Generic;
 using System.Runtime.Serialization;