diff --git a/specifications/JSLintNet.QualityTools/Expectations/Expectation`1.cs b/specifications/JSLintNet.QualityTools/Expectations/Expectation.cs
similarity index 65%
rename from specifications/JSLintNet.QualityTools/Expectations/Expectation`1.cs
rename to specifications/JSLintNet.QualityTools/Expectations/Expectation.cs
index 8cc0249..3b48505 100644
--- a/specifications/JSLintNet.QualityTools/Expectations/Expectation`1.cs
+++ b/specifications/JSLintNet.QualityTools/Expectations/Expectation.cs
@@ -3,14 +3,14 @@
     /// <summary>
     /// An expectation that can be reversed to a negative state.
     /// </summary>
-    /// <typeparam name="T">Any type.</typeparam>
-    public class Expectation<T> : IReversibleExpectation<T>
+    /// <typeparam name="TActual">Any type.</typeparam>
+    public class Expectation<TActual> : IReversibleExpectation<TActual>
     {
         /// <summary>
-        /// Initializes a new instance of the <see cref="Expectation{T}" /> class.
+        /// Initializes a new instance of the <see cref="Expectation{TActual}" /> class.
         /// </summary>
         /// <param name="actual">The value.</param>
-        public Expectation(T actual)
+        public Expectation(TActual actual)
         {
             this.Actual = actual;
             this.Positive = true;
@@ -22,10 +22,10 @@ public Expectation(T actual)
         /// <value>
         /// The actual value.
         /// </value>
-        public T Actual { get; private set; }
+        public TActual Actual { get; private set; }
 
         /// <summary>
-        /// Gets a value indicating whether this <see cref="Expectation{T}" /> is positive.
+        /// Gets a value indicating whether this <see cref="Expectation{TActual}" /> is positive.
         /// </summary>
         /// <value>
         ///   <c>true</c> if positive; otherwise, <c>false</c>.
@@ -38,7 +38,7 @@ public Expectation(T actual)
         /// <value>
         /// The negative expectation.
         /// </value>
-        public IExpectation<T> Not
+        public IExpectation<TActual> Not
         {
             get
             {
@@ -47,17 +47,6 @@ public IExpectation<T> Not
             }
         }
 
-        /// <summary>
-        /// Matcher that determines whether the actual and expected values are equal.
-        /// </summary>
-        /// <param name="expected">The expected value.</param>
-        public void ToBe(T expected)
-        {
-            var pass = this.Actual == null ? expected == null : this.Actual.Equals(expected);
-
-            ExpectationHelper.PassFail(pass, this, expected);
-        }
-
         /// <summary>
         /// Matcher that determines whether the actual value is null.
         /// </summary>
@@ -69,12 +58,12 @@ public void ToBeNull()
         /// <summary>
         /// Matcher that determines whether the actual value type is the same as the given type.
         /// </summary>
-        /// <typeparam name="S">The type to compare.</typeparam>
-        public void ToBeOfType<S>()
+        /// <typeparam name="TExpected">The type to compare.</typeparam>
+        public void ToBeOfType<TExpected>()
         {
-            var typeOfS = typeof(S);
+            var expectedType = typeof(TExpected);
 
-            ExpectationHelper.PassFail(this.Actual.GetType() == typeOfS, this, typeOfS.ToString());
+            ExpectationHelper.PassFail(this.Actual.GetType() == expectedType, this, expectedType.ToString());
         }
     }
 }
diff --git a/specifications/JSLintNet.QualityTools/Expectations/ExpectationDictionaryExtensions.cs b/specifications/JSLintNet.QualityTools/Expectations/ExpectationDictionaryExtensions.cs
index 5c18d52..2062f70 100644
--- a/specifications/JSLintNet.QualityTools/Expectations/ExpectationDictionaryExtensions.cs
+++ b/specifications/JSLintNet.QualityTools/Expectations/ExpectationDictionaryExtensions.cs
@@ -4,8 +4,7 @@
 
     public static class ExpectationDictionaryExtensions
     {
-        public static void ToContainKey<E>(this IExpectation<E> expectation, object key)
-            where E : IDictionary
+        public static void ToContainKey(this IExpectation<IDictionary> expectation, object key)
         {
             ExpectationHelper.PassFail(expectation.Actual.Contains(key), expectation, key.ToString());
         }
diff --git a/specifications/JSLintNet.QualityTools/Expectations/ExpectationEnumerableExtensions.cs b/specifications/JSLintNet.QualityTools/Expectations/ExpectationEnumerableExtensions.cs
index 935e240..cfa51c2 100644
--- a/specifications/JSLintNet.QualityTools/Expectations/ExpectationEnumerableExtensions.cs
+++ b/specifications/JSLintNet.QualityTools/Expectations/ExpectationEnumerableExtensions.cs
@@ -1,26 +1,22 @@
 namespace JSLintNet.QualityTools.Expectations
 {
     using System;
-    using System.Collections;
     using System.Collections.Generic;
     using System.Linq;
 
     public static class ExpectationEnumerableExtensions
     {
-        public static void ToBeEmpty<E>(this IExpectation<E> expectation)
-            where E : IEnumerable
+        public static void ToBeEmpty<TItem>(this IExpectation<IEnumerable<TItem>> expectation)
         {
-            ExpectationHelper.PassFail(!expectation.Actual.GetEnumerator().MoveNext(), expectation);
+            ExpectationHelper.PassFail(!expectation.Actual.Any(), expectation);
         }
 
-        public static void ToContain<E, T>(this IExpectation<E> expectation, T expected)
-            where E : IEnumerable<T>
+        public static void ToContain<TItem>(this IExpectation<IEnumerable<TItem>> expectation, TItem expected)
         {
             ExpectationHelper.PassFail(expectation.Actual.Contains(expected), expectation, expected.ToString());
         }
 
-        public static void ToContain<E, T>(this IExpectation<E> expectation, Func<T, bool> predicate)
-            where E : IEnumerable<T>
+        public static void ToContain<TItem>(this IExpectation<IEnumerable<TItem>> expectation, Func<TItem, bool> predicate)
         {
             ExpectationHelper.PassFail(expectation.Actual.Any(predicate), expectation, predicate.ToString());
         }
diff --git a/specifications/JSLintNet.QualityTools/Expectations/ExpectationExtensions.cs b/specifications/JSLintNet.QualityTools/Expectations/ExpectationExtensions.cs
new file mode 100644
index 0000000..b17b967
--- /dev/null
+++ b/specifications/JSLintNet.QualityTools/Expectations/ExpectationExtensions.cs
@@ -0,0 +1,12 @@
+namespace JSLintNet.QualityTools.Expectations
+{
+    public static class ExpectationExtensions
+    {
+        public static void ToBe<TActual>(this IExpectation<TActual> expectation, TActual expected)
+        {
+            var pass = expectation.Actual == null ? expected == null : expectation.Actual.Equals(expected);
+
+            ExpectationHelper.PassFail(pass, expectation, expected);
+        }
+    }
+}
diff --git a/specifications/JSLintNet.QualityTools/Expectations/I.cs b/specifications/JSLintNet.QualityTools/Expectations/I.cs
index 1cb5554..6d57523 100644
--- a/specifications/JSLintNet.QualityTools/Expectations/I.cs
+++ b/specifications/JSLintNet.QualityTools/Expectations/I.cs
@@ -10,19 +10,26 @@ public static class I
         /// <summary>
         /// Creates a new expectation.
         /// </summary>
-        /// <typeparam name="T">The type of the actual value.</typeparam>
+        /// <typeparam name="TActual">The type of the actual value.</typeparam>
         /// <param name="actual">The actual value.</param>
         /// <returns>
         /// The expectation.
         /// </returns>
-        public static IReversibleExpectation<T> Expect<T>(T actual)
+        public static IReversibleExpectation<TActual> Expect<TActual>(TActual actual)
         {
-            return new Expectation<T>(actual);
+            return new Expectation<TActual>(actual);
         }
 
-        public static IReversibleExpectation<Action> Expect(Action actual)
+        /// <summary>
+        /// Creates a new delegate expectation.
+        /// </summary>
+        /// <param name="action">The action.</param>
+        /// <returns>
+        /// The expectation.
+        /// </returns>
+        public static IReversibleExpectation<Action> Expect(Action action)
         {
-            return new Expectation<Action>(actual);
+            return new Expectation<Action>(action);
         }
     }
 }
diff --git a/specifications/JSLintNet.QualityTools/Expectations/IExpectation`1.cs b/specifications/JSLintNet.QualityTools/Expectations/IExpectation.cs
similarity index 65%
rename from specifications/JSLintNet.QualityTools/Expectations/IExpectation`1.cs
rename to specifications/JSLintNet.QualityTools/Expectations/IExpectation.cs
index 5f231c5..3e12d61 100644
--- a/specifications/JSLintNet.QualityTools/Expectations/IExpectation`1.cs
+++ b/specifications/JSLintNet.QualityTools/Expectations/IExpectation.cs
@@ -3,8 +3,8 @@
     /// <summary>
     /// An expectation.
     /// </summary>
-    /// <typeparam name="T">Any type.</typeparam>
-    public interface IExpectation<T>
+    /// <typeparam name="TActual">Any type.</typeparam>
+    public interface IExpectation<out TActual>
     {
         /// <summary>
         /// Gets the actual value.
@@ -12,7 +12,7 @@ public interface IExpectation<T>
         /// <value>
         /// The actual value.
         /// </value>
-        T Actual { get; }
+        TActual Actual { get; }
 
         /// <summary>
         /// Gets a value indicating whether this <see cref="IExpectation`1" /> is positive.
@@ -22,12 +22,6 @@ public interface IExpectation<T>
         /// </value>
         bool Positive { get; }
 
-        /// <summary>
-        /// Matcher that determines whether the actual and expected values are the same.
-        /// </summary>
-        /// <param name="expected">The expected value.</param>
-        void ToBe(T expected);
-
         /// <summary>
         /// Matcher that determines whether the actual value is null.
         /// </summary>
@@ -36,7 +30,7 @@ public interface IExpectation<T>
         /// <summary>
         /// Matcher that determines whether the actual value type is the same as the given type.
         /// </summary>
-        /// <typeparam name="S">The type to compare.</typeparam>
-        void ToBeOfType<S>();
+        /// <typeparam name="TExpected">The type to compare.</typeparam>
+        void ToBeOfType<TExpected>();
     }
 }
diff --git a/specifications/JSLintNet.QualityTools/Expectations/IReversibleExpectation`1.cs b/specifications/JSLintNet.QualityTools/Expectations/IReversibleExpectation.cs
similarity index 64%
rename from specifications/JSLintNet.QualityTools/Expectations/IReversibleExpectation`1.cs
rename to specifications/JSLintNet.QualityTools/Expectations/IReversibleExpectation.cs
index 922c141..e45525b 100644
--- a/specifications/JSLintNet.QualityTools/Expectations/IReversibleExpectation`1.cs
+++ b/specifications/JSLintNet.QualityTools/Expectations/IReversibleExpectation.cs
@@ -3,8 +3,8 @@
     /// <summary>
     /// An expectation that can be reversed to a negative state.
     /// </summary>
-    /// <typeparam name="T">Any type.</typeparam>
-    public interface IReversibleExpectation<T> : IExpectation<T>
+    /// <typeparam name="TActual">Any type.</typeparam>
+    public interface IReversibleExpectation<out TActual> : IExpectation<TActual>
     {
         /// <summary>
         /// Gets the negative expectation.
@@ -12,6 +12,6 @@ public interface IReversibleExpectation<T> : IExpectation<T>
         /// <value>
         /// The negative expectation.
         /// </value>
-        IExpectation<T> Not { get; }
+        IExpectation<TActual> Not { get; }
     }
 }
diff --git a/specifications/JSLintNet.QualityTools/JSLintNet.QualityTools.csproj b/specifications/JSLintNet.QualityTools/JSLintNet.QualityTools.csproj
index 16a93a9..61f985c 100644
--- a/specifications/JSLintNet.QualityTools/JSLintNet.QualityTools.csproj
+++ b/specifications/JSLintNet.QualityTools/JSLintNet.QualityTools.csproj
@@ -80,13 +80,14 @@
     <Compile Include="Expectations\ExpectationBooleanExtensions.cs" />
     <Compile Include="Expectations\ExpectationDictionaryExtensions.cs" />
     <Compile Include="Expectations\ExpectationEnumerableExtensions.cs" />
+    <Compile Include="Expectations\ExpectationExtensions.cs" />
     <Compile Include="Expectations\ExpectationHelper.cs" />
     <Compile Include="Expectations\ExpectationInt32Extensions.cs" />
     <Compile Include="Expectations\ExpectationStringExtensions.cs" />
-    <Compile Include="Expectations\Expectation`1.cs" />
+    <Compile Include="Expectations\Expectation.cs" />
     <Compile Include="Expectations\I.cs" />
-    <Compile Include="Expectations\IExpectation`1.cs" />
-    <Compile Include="Expectations\IReversibleExpectation`1.cs" />
+    <Compile Include="Expectations\IExpectation.cs" />
+    <Compile Include="Expectations\IReversibleExpectation.cs" />
     <Compile Include="Fakes\JSLintDataFake.cs" />
     <Compile Include="Fakes\JSLintWarningFake.cs" />
     <Compile Include="IDependencyRegistrar.cs" />
diff --git a/specifications/JSLintNet.Specifications/Tasks/JSLintTaskUnit.cs b/specifications/JSLintNet.Specifications/Tasks/JSLintTaskUnit.cs
index eece1f2..10fc92f 100644
--- a/specifications/JSLintNet.Specifications/Tasks/JSLintTaskUnit.cs
+++ b/specifications/JSLintNet.Specifications/Tasks/JSLintTaskUnit.cs
@@ -11,7 +11,6 @@
     using JSLintNet.QualityTools.Expectations;
     using JSLintNet.QualityTools.Fakes;
     using JSLintNet.Settings;
-    using Microsoft.Build.Framework;
     using Moq;
     using Xunit;
 
@@ -89,7 +88,7 @@ public void Spec16()
 
                     testable.Instance.Execute();
 
-                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain((BuildErrorEventArgs x) => x.Message == string.Format(Resources.ErrorLimitReachedFormat, JSLintNetSettings.DefaultErrorLimit));
+                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain(x => x.Message == string.Format(Resources.ErrorLimitReachedFormat, JSLintNetSettings.DefaultErrorLimit));
                 }
             }
 
@@ -110,7 +109,7 @@ public void Spec17()
 
                     testable.Instance.Execute();
 
-                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain((BuildErrorEventArgs x) => x.Message == string.Format(Resources.ExceptionLimitReachedFormat, JSLintNetSettings.ExceptionLimit));
+                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain(x => x.Message == string.Format(Resources.ExceptionLimitReachedFormat, JSLintNetSettings.ExceptionLimit));
                 }
             }
 
@@ -126,7 +125,7 @@ public void Spec18()
 
                     testable.Instance.Execute();
 
-                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain((BuildErrorEventArgs x) => x.Message == string.Format(Resources.FileLimitReachedFormat, JSLintNetSettings.DefaultFileLimit));
+                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain(x => x.Message == string.Format(Resources.FileLimitReachedFormat, JSLintNetSettings.DefaultFileLimit));
                 }
             }
 
@@ -141,7 +140,7 @@ public void Spec19()
 
                     testable.Instance.Execute();
 
-                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain((BuildErrorEventArgs x) => x.Message == string.Format(Resources.ErrorLimitReachedFormat, 11));
+                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain(x => x.Message == string.Format(Resources.ErrorLimitReachedFormat, 11));
                 }
             }
 
@@ -160,7 +159,7 @@ public void Spec20()
 
                     testable.Instance.Execute();
 
-                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain((BuildErrorEventArgs x) => x.Message == string.Format(Resources.FileLimitReachedFormat, 10));
+                    I.Expect(testable.BuildEngine.ErrorEvents).ToContain(x => x.Message == string.Format(Resources.FileLimitReachedFormat, 10));
                 }
             }