diff --git a/lib/RevBank/Amount.pm b/lib/RevBank/Amount.pm
index 44f0285..c48d3de 100644
--- a/lib/RevBank/Amount.pm
+++ b/lib/RevBank/Amount.pm
@@ -2,8 +2,8 @@ package RevBank::Amount;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'isa';         # stable since v5.32
+use experimental 'signatures';  # stable since v5.36
 
 use Carp qw(carp croak);
 use Scalar::Util;
@@ -13,7 +13,7 @@ our $C = __PACKAGE__;
 
 sub _coerce {
     for (@_) {
-        unless (ref and UNIVERSAL::isa($_, $C)) {
+        unless ($_ isa $C) {
             croak "Unsupported operation on $C with " . ref if ref;
             croak "Unsupported operation on $C with undef" if not defined;
 
diff --git a/lib/RevBank/Cart.pm b/lib/RevBank/Cart.pm
index 7c7df7c..f41df75 100644
--- a/lib/RevBank/Cart.pm
+++ b/lib/RevBank/Cart.pm
@@ -2,8 +2,7 @@ package RevBank::Cart;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use Carp ();
 use List::Util ();
diff --git a/lib/RevBank/Cart/Entry.pm b/lib/RevBank/Cart/Entry.pm
index 84b48ce..f9cd416 100644
--- a/lib/RevBank/Cart/Entry.pm
+++ b/lib/RevBank/Cart/Entry.pm
@@ -2,8 +2,7 @@ package RevBank::Cart::Entry;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use Carp qw(carp croak);
 use RevBank::Users;
diff --git a/lib/RevBank/FileIO.pm b/lib/RevBank/FileIO.pm
index a54412c..36b53ae 100644
--- a/lib/RevBank/FileIO.pm
+++ b/lib/RevBank/FileIO.pm
@@ -2,8 +2,7 @@ package RevBank::FileIO;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use autodie;
 use Fcntl qw(:flock);
diff --git a/lib/RevBank/Global.pm b/lib/RevBank/Global.pm
index 07425dd..26d28b2 100644
--- a/lib/RevBank/Global.pm
+++ b/lib/RevBank/Global.pm
@@ -2,8 +2,7 @@ package RevBank::Global;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use POSIX qw(strftime);
 use RevBank::Amount;
diff --git a/lib/RevBank/Messages.pm b/lib/RevBank/Messages.pm
index bc85f8d..923910c 100644
--- a/lib/RevBank/Messages.pm
+++ b/lib/RevBank/Messages.pm
@@ -2,8 +2,7 @@ package RevBank::Messages;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use RevBank::Global;
 use base 'RevBank::Plugin';
diff --git a/lib/RevBank/Plugin.pm b/lib/RevBank/Plugin.pm
index 9fc3231..3eccb05 100644
--- a/lib/RevBank/Plugin.pm
+++ b/lib/RevBank/Plugin.pm
@@ -2,8 +2,7 @@ package RevBank::Plugin;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 require RevBank::Global;
 
diff --git a/lib/RevBank/Plugins.pm b/lib/RevBank/Plugins.pm
index c5710d2..a113e98 100644
--- a/lib/RevBank/Plugins.pm
+++ b/lib/RevBank/Plugins.pm
@@ -2,8 +2,7 @@ package RevBank::Plugins;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use RevBank::Eval;
 use RevBank::Plugin;
diff --git a/lib/RevBank/TextEditor.pm b/lib/RevBank/TextEditor.pm
index ea76bc3..5429ecd 100644
--- a/lib/RevBank/TextEditor.pm
+++ b/lib/RevBank/TextEditor.pm
@@ -2,8 +2,7 @@ package RevBank::TextEditor;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use autodie;
 use RevBank::Global;
diff --git a/lib/RevBank/Users.pm b/lib/RevBank/Users.pm
index 5e6a6cf..663c8a8 100644
--- a/lib/RevBank/Users.pm
+++ b/lib/RevBank/Users.pm
@@ -2,8 +2,7 @@ package RevBank::Users;
 
 use v5.28;
 use warnings;
-use feature qw(signatures);
-no warnings qw(experimental::signatures);
+use experimental 'signatures';  # stable since v5.36
 
 use RevBank::Global;
 use RevBank::Plugins;