diff --git a/source/Buoy-Collections-Tests/CircularIteratorTest.class.st b/source/Buoy-Collections-Tests/CircularIteratorTest.class.st
index 6c6e883..d63bd96 100644
--- a/source/Buoy-Collections-Tests/CircularIteratorTest.class.st
+++ b/source/Buoy-Collections-Tests/CircularIteratorTest.class.st
@@ -4,7 +4,7 @@ A CircularIteratorTest is a test class for testing the behavior of CircularItera
 Class {
 	#name : #CircularIteratorTest,
 	#superclass : #TestCase,
-	#category : 'Buoy-Collections-Tests'
+	#category : #'Buoy-Collections-Tests'
 }
 
 { #category : #'tests-accessing' }
@@ -40,12 +40,11 @@ CircularIteratorTest >> testIncludes [
 	| iterator |
 
 	iterator := CircularIterator cyclingOver: #(1 2 3).
-
 	self
-		assert: (iterator includes: 1);
-		assert: (iterator includes: 2);
-		assert: (iterator includes: 3);
-		deny: (iterator includes: 4)
+		assert: iterator includes: 1;
+		assert: iterator includes: 2;
+		assert: iterator includes: 3;
+		deny: iterator includes: 4
 ]
 
 { #category : #'tests-accessing' }
diff --git a/source/Buoy-Dynamic-Binding-Tests/OptionalTest.class.st b/source/Buoy-Dynamic-Binding-Tests/OptionalTest.class.st
index 16f926a..cd2d862 100644
--- a/source/Buoy-Dynamic-Binding-Tests/OptionalTest.class.st
+++ b/source/Buoy-Dynamic-Binding-Tests/OptionalTest.class.st
@@ -4,7 +4,7 @@ An OptionalTest is a test class for testing the behavior of Optional
 Class {
 	#name : #OptionalTest,
 	#superclass : #TestCase,
-	#category : 'Buoy-Dynamic-Binding-Tests'
+	#category : #'Buoy-Dynamic-Binding-Tests'
 }
 
 { #category : #private }
@@ -21,10 +21,10 @@ OptionalTest >> testEqualsWhenUnused [
 	optional := Optional unused.
 	self
 		assert: optional equals: optional;
-		deny: optional = (Optional containing: 'content');
-		deny: (Optional containing: 'content') = optional;
-		deny: optional = (Optional containing: 1);
-		deny: (Optional containing: 1) = optional;
+		deny: optional equals: ( Optional containing: 'content' );
+		deny: ( Optional containing: 'content' ) equals: optional;
+		deny: optional equals: ( Optional containing: 1 );
+		deny: ( Optional containing: 1 ) equals: optional;
 		assert: optional equals: Optional unused;
 		assert: Optional unused equals: optional
 ]
@@ -37,12 +37,12 @@ OptionalTest >> testEqualsWhenUsed [
 	optional := Optional containing: 1.
 	self
 		assert: optional equals: optional;
-		deny: optional = (Optional containing: 'content');
-		deny: (Optional containing: 'content') = optional;
-		assert: optional equals: (Optional containing: 1);
-		assert: (Optional containing: 1) equals: optional;
-		deny: optional = Optional unused;
-		deny: Optional unused = optional
+		deny: optional equals: ( Optional containing: 'content' );
+		deny: ( Optional containing: 'content' ) equals: optional;
+		assert: optional equals: ( Optional containing: 1 );
+		assert: ( Optional containing: 1 ) equals: optional;
+		deny: optional equals: Optional unused;
+		deny: Optional unused equals: optional
 ]
 
 { #category : #'tests-comparing' }
@@ -52,9 +52,9 @@ OptionalTest >> testHash [
 
 	optional := Optional containing: 1.
 	self
-		assert: optional hash equals: (Optional containing: 1) hash;
-		deny: optional hash = (Optional containing: 'content') hash;
-		deny: optional hash = Optional unused hash;
+		assert: optional hash equals: ( Optional containing: 1 ) hash;
+		deny: optional hash equals: ( Optional containing: 'content' ) hash;
+		deny: optional hash equals: Optional unused hash;
 		assert: Optional unused hash equals: Optional unused hash
 ]
 
diff --git a/source/Buoy-Dynamic-Binding/Optional.class.st b/source/Buoy-Dynamic-Binding/Optional.class.st
index 63560a9..5f45bb3 100644
--- a/source/Buoy-Dynamic-Binding/Optional.class.st
+++ b/source/Buoy-Dynamic-Binding/Optional.class.st
@@ -4,7 +4,7 @@ I'm an abstract  class representing the fact that some object can be optional.
 Class {
 	#name : #Optional,
 	#superclass : #Object,
-	#category : 'Buoy-Dynamic-Binding'
+	#category : #'Buoy-Dynamic-Binding'
 }
 
 { #category : #'instance creation' }
@@ -62,8 +62,9 @@ Optional class >> withUsedOnlyIn: optionals return: aMonadycBlock [
 { #category : #comparing }
 Optional >> = anObject [
 
-	^ self value == anObject
-		or: [ (anObject isA: self class) and: [ self equalsTo: anObject ] ]
+	^ self equalityChecker
+		compareWith: [ :base :target | base equalsTo: target ];
+		checkAgainst: anObject
 ]
 
 { #category : #private }
diff --git a/source/Buoy-Metaprogramming-Tests/KeywordMessageSendingCollectorTest.class.st b/source/Buoy-Metaprogramming-Tests/KeywordMessageSendingCollectorTest.class.st
index 7810e82..ed8a48b 100644
--- a/source/Buoy-Metaprogramming-Tests/KeywordMessageSendingCollectorTest.class.st
+++ b/source/Buoy-Metaprogramming-Tests/KeywordMessageSendingCollectorTest.class.st
@@ -7,7 +7,7 @@ Class {
 	#instVars : [
 		'arguments'
 	],
-	#category : 'Buoy-Metaprogramming-Tests'
+	#category : #'Buoy-Metaprogramming-Tests'
 }
 
 { #category : #initialization }
@@ -24,7 +24,7 @@ KeywordMessageSendingCollectorTest >> testValue [
 
 	self
 		assert: arguments size equals: 1;
-		assert: (arguments includes: 1)
+		assert: arguments includes: 1
 ]
 
 { #category : #private }
diff --git a/source/Buoy-Metaprogramming-Tests/UnaryMessageSendingCollectorTest.class.st b/source/Buoy-Metaprogramming-Tests/UnaryMessageSendingCollectorTest.class.st
index 44a6f56..7b8f308 100644
--- a/source/Buoy-Metaprogramming-Tests/UnaryMessageSendingCollectorTest.class.st
+++ b/source/Buoy-Metaprogramming-Tests/UnaryMessageSendingCollectorTest.class.st
@@ -7,7 +7,7 @@ Class {
 	#instVars : [
 		'messagesSent'
 	],
-	#category : 'Buoy-Metaprogramming-Tests'
+	#category : #'Buoy-Metaprogramming-Tests'
 }
 
 { #category : #private }
@@ -20,33 +20,36 @@ UnaryMessageSendingCollectorTest >> setUp [
 { #category : #'tests-evaluating' }
 UnaryMessageSendingCollectorTest >> testValue [
 
-	(UnaryMessageSendingCollector sendingAllMessagesBeginningWith: 'zzzTest' andEndingWith: 'Test' to: self) value.
+	( UnaryMessageSendingCollector
+		sendingAllMessagesBeginningWith: 'zzzTest'
+		andEndingWith: 'Test'
+		to: self ) value.
 
 	self
 		assert: messagesSent size equals: 1;
-		assert: (messagesSent includes: #zzzTest)
+		assert: messagesSent includes: #zzzTest
 ]
 
 { #category : #'tests-evaluating' }
 UnaryMessageSendingCollectorTest >> testValueWithPrefix [
 
-	(UnaryMessageSendingCollector sendingAllMessagesBeginningWith: 'zzzTest' to: self) value.
+	( UnaryMessageSendingCollector sendingAllMessagesBeginningWith: 'zzzTest' to: self ) value.
 
 	self
 		assert: messagesSent size equals: 2;
-		assert: (messagesSent includes: #zzzTest);
-		assert: (messagesSent includes: #zzzTest2)
+		assert: messagesSent includes: #zzzTest;
+		assert: messagesSent includes: #zzzTest2
 ]
 
 { #category : #'tests-evaluating' }
 UnaryMessageSendingCollectorTest >> testValueWithSuffix [
 
-	(UnaryMessageSendingCollector sendingAllMessagesEndingWith: 'Test2' to: self) value.
+	( UnaryMessageSendingCollector sendingAllMessagesEndingWith: 'Test2' to: self ) value.
 
 	self
 		assert: messagesSent size equals: 2;
-		assert: (messagesSent includes: #zzzTest2);
-		assert: (messagesSent includes: #zzTest2)
+		assert: messagesSent includes: #zzzTest2;
+		assert: messagesSent includes: #zzTest2
 ]
 
 { #category : #private }