diff --git a/Source/Mockolate/Web/ItExtensions.HttpContent.cs b/Source/Mockolate/Web/ItExtensions.HttpContent.cs
index 83012c9f..2b7d5f21 100644
--- a/Source/Mockolate/Web/ItExtensions.HttpContent.cs
+++ b/Source/Mockolate/Web/ItExtensions.HttpContent.cs
@@ -139,7 +139,7 @@ public IHttpContentHeaderParameter WithHeaders(params IEnumerable<(string Name,
 
 		/// <inheritdoc cref="IParameter.Matches(object?)" />
 		bool IParameter.Matches(object? value)
-			=> value is HttpContent content ? Matches(content) : value is null && Matches(null);
+			=> value is HttpContent content && Matches(content);
 
 		/// <inheritdoc cref="IParameter.InvokeCallbacks(object?)" />
 		void IParameter.InvokeCallbacks(object? value)
diff --git a/Source/Mockolate/Web/ItExtensions.HttpRequestMessage.cs b/Source/Mockolate/Web/ItExtensions.HttpRequestMessage.cs
index 592094d9..5ee3f817 100644
--- a/Source/Mockolate/Web/ItExtensions.HttpRequestMessage.cs
+++ b/Source/Mockolate/Web/ItExtensions.HttpRequestMessage.cs
@@ -182,8 +182,7 @@ protected virtual bool Matches(HttpRequestMessage value)
 		/// <inheritdoc cref="object.ToString()" />
 		public override string ToString()
 		{
-			// Stryker disable once Collection : the Where(!string.IsNullOrEmpty) filter at the return strips any default null entry, so seeding the list with [default] produces the same output as the empty seed.
-			List<string?> parts = [];
+			List<string?> parts = new();
 			if (_uriParameter is not null)
 			{
 				parts.Add(_uriParameter.ToString());
diff --git a/Source/Mockolate/Web/ItExtensions.Uri.cs b/Source/Mockolate/Web/ItExtensions.Uri.cs
index 54cf191d..698181b4 100644
--- a/Source/Mockolate/Web/ItExtensions.Uri.cs
+++ b/Source/Mockolate/Web/ItExtensions.Uri.cs
@@ -5,7 +5,6 @@
 using Mockolate.Internals;
 using Mockolate.Parameters;
 #if NETSTANDARD2_0
-using Mockolate.Internals.Polyfills;
 #endif
 
 namespace Mockolate.Web;
@@ -134,7 +133,7 @@ private sealed class UriParameter(string? pattern) : IUriParameter, IParameterMa
 
 		/// <inheritdoc cref="IParameter.Matches(object?)" />
 		bool IParameter.Matches(object? value)
-			=> value is Uri uri ? Matches(uri) : value is null && Matches(null);
+			=> value is Uri uri && Matches(uri);
 
 		/// <inheritdoc cref="IParameter.InvokeCallbacks(object?)" />
 		void IParameter.InvokeCallbacks(object? value)
@@ -215,15 +214,10 @@ private bool Matches(Uri? uri)
 				return false;
 			}
 
-			if (pattern is not null)
+			if (pattern is not null &&
+			    !Wildcard.Pattern(pattern, true, false).Matches(uri.ToString()))
 			{
-				string requestUri1 = uri.ToString();
-				Wildcard wildcard = Wildcard.Pattern(pattern, true, false);
-				if (!wildcard.Matches(requestUri1) &&
-				    (!requestUri1.EndsWith('/') || !wildcard.Matches(requestUri1.TrimEnd('/'))))
-				{
-					return false;
-				}
+				return false;
 			}
 
 			if (_scheme is not null &&