diff --git a/package.yaml b/package.yaml
index 58af88ff..af4eb9a2 100644
--- a/package.yaml
+++ b/package.yaml
@@ -29,6 +29,7 @@ dependencies:
 - async >= 2.2 && < 3
 - type-errors >= 0.2.0.0
 - type-errors-pretty >= 0.0.0.0 && < 0.1
+- polysemy-plugin >= 0.2.3.0
 
 default-extensions:
   - DataKinds
@@ -104,6 +105,7 @@ tests:
     - -threaded
     - -rtsopts
     - -with-rtsopts=-N
+    - -fplugin=Polysemy.Plugin
     build-tools:
     - hspec-discover >= 2.0
     dependencies:
@@ -111,6 +113,7 @@ tests:
     - inspection-testing >= 0.4.2 && < 0.5
     - hspec >= 2.6.0 && < 3
     - doctest >= 0.16.0.1 && < 0.17
+    - should-not-typecheck >= 2.1.0 && < 3
 
 benchmarks:
   polysemy-bench:
diff --git a/polysemy-plugin/package.yaml b/polysemy-plugin/package.yaml
index 35a631af..fab35161 100644
--- a/polysemy-plugin/package.yaml
+++ b/polysemy-plugin/package.yaml
@@ -19,32 +19,32 @@ dependencies:
 - base >= 4.9 && < 5
 - ghc >= 8.4.4 && < 9
 - ghc-tcplugins-extra >= 0.3 && < 0.4
-- polysemy >= 0.6
 - syb >= 0.7 && < 0.8
 - transformers >= 0.5.2.0 && < 0.6
 - containers >= 0.5 && < 0.7
 
+
 library:
   source-dirs: src
 
-tests:
-  polysemy-plugin-test:
-    main:                Main.hs
-    source-dirs:         test
-    ghc-options:
-    - -threaded
-    - -rtsopts
-    - -with-rtsopts=-N
-    - -fplugin=Polysemy.Plugin
-    build-tools:
-    - hspec-discover
-    dependencies:
-    - polysemy >= 1.2.0.0
-    - polysemy-plugin
-    - hspec >= 2.6.0 && < 3
-    - should-not-typecheck >= 2.1.0 && < 3
-    - inspection-testing >= 0.4.2 && < 0.5
-    - doctest >= 0.16.0.1 && < 0.17
+# tests:
+#   polysemy-plugin-test:
+#     main:                Main.hs
+#     source-dirs:         test
+#     ghc-options:
+#     - -threaded
+#     - -rtsopts
+#     - -with-rtsopts=-N
+#     - -fplugin=Polysemy.Plugin
+#     build-tools:
+#     - hspec-discover
+#     dependencies:
+#     - polysemy >= 1.2.0.0
+#     - polysemy-plugin
+#     - hspec >= 2.6.0 && < 3
+#     - should-not-typecheck >= 2.1.0 && < 3
+#     - inspection-testing >= 0.4.2 && < 0.5
+#     - doctest >= 0.16.0.1 && < 0.17
 
 default-extensions:
   - DataKinds
diff --git a/polysemy-plugin/polysemy-plugin.cabal b/polysemy-plugin/polysemy-plugin.cabal
index 7ff9ca88..e638ff8c 100644
--- a/polysemy-plugin/polysemy-plugin.cabal
+++ b/polysemy-plugin/polysemy-plugin.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 01634ce3c7ac101e60c1a02f8ccad7ec499c02a04b66e5d9dd5993f314318097
+-- hash: 40bcdc39ae4c51f9579589c0fbb38bb5773c918d6f5a8b9dcccabd7b9b136230
 
 name:           polysemy-plugin
 version:        0.2.3.0
@@ -45,41 +45,6 @@ library
     , containers >=0.5 && <0.7
     , ghc >=8.4.4 && <9
     , ghc-tcplugins-extra >=0.3 && <0.4
-    , polysemy >=0.6
-    , syb >=0.7 && <0.8
-    , transformers >=0.5.2.0 && <0.6
-  default-language: Haskell2010
-
-test-suite polysemy-plugin-test
-  type: exitcode-stdio-1.0
-  main-is: Main.hs
-  other-modules:
-      BadSpec
-      DoctestSpec
-      ExampleSpec
-      LegitimateTypeErrorSpec
-      MultipleVarsSpec
-      PluginSpec
-      TypeErrors
-      VDQSpec
-      Paths_polysemy_plugin
-  hs-source-dirs:
-      test
-  default-extensions: DataKinds DeriveFunctor FlexibleContexts GADTs LambdaCase PolyKinds RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeOperators TypeFamilies UnicodeSyntax
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N -fplugin=Polysemy.Plugin
-  build-tool-depends:
-      hspec-discover:hspec-discover
-  build-depends:
-      base >=4.9 && <5
-    , containers >=0.5 && <0.7
-    , doctest >=0.16.0.1 && <0.17
-    , ghc >=8.4.4 && <9
-    , ghc-tcplugins-extra >=0.3 && <0.4
-    , hspec >=2.6.0 && <3
-    , inspection-testing >=0.4.2 && <0.5
-    , polysemy >=1.2.0.0
-    , polysemy-plugin
-    , should-not-typecheck >=2.1.0 && <3
     , syb >=0.7 && <0.8
     , transformers >=0.5.2.0 && <0.6
   default-language: Haskell2010
diff --git a/polysemy-plugin/test/DoctestSpec.hs b/polysemy-plugin/test/DoctestSpec.hs
deleted file mode 100644
index 69b1f15b..00000000
--- a/polysemy-plugin/test/DoctestSpec.hs
+++ /dev/null
@@ -1,32 +0,0 @@
-{-# LANGUAGE CPP #-}
-
-module DoctestSpec where
-
-import Test.Hspec
-import Test.DocTest
-
-spec :: Spec
-spec = parallel $ describe "Error messages" $ it "should pass the doctest" $ doctest
-  [ "--fast"
-  , "-fobject-code"
-  , "-XDataKinds"
-  , "-XDeriveFunctor"
-  , "-XFlexibleContexts"
-  , "-XGADTs"
-  , "-XLambdaCase"
-  , "-XPolyKinds"
-  , "-XRankNTypes"
-  , "-XScopedTypeVariables"
-  , "-XStandaloneDeriving"
-  , "-XTypeApplications"
-  , "-XTypeFamilies"
-  , "-XTypeOperators"
-  , "-XUnicodeSyntax"
-
-#if __GLASGOW_HASKELL__ < 806
-  , "-XMonadFailDesugaring"
-  , "-XTypeInType"
-#endif
-
-  , "test/TypeErrors.hs"
-  ]
diff --git a/polysemy-plugin/test/Main.hs b/polysemy-plugin/test/Main.hs
deleted file mode 100644
index a824f8c3..00000000
--- a/polysemy-plugin/test/Main.hs
+++ /dev/null
@@ -1 +0,0 @@
-{-# OPTIONS_GHC -F -pgmF hspec-discover #-}
diff --git a/polysemy.cabal b/polysemy.cabal
index da1fb7e0..b3897c6a 100644
--- a/polysemy.cabal
+++ b/polysemy.cabal
@@ -4,7 +4,7 @@ cabal-version: 1.12
 --
 -- see: https://github.com/sol/hpack
 --
--- hash: 7ce7e4fdc1a3ebff15b38a550ed247a4ad04bb4c383ad4440212926b3eeea93c
+-- hash: f721d7330405d7fbf95c1c031a2bf26a4b1246390a65be0aa35060363168374f
 
 name:           polysemy
 version:        1.2.1.0
@@ -84,6 +84,7 @@ library
     , containers >=0.5 && <0.7
     , first-class-families >=0.5.0.0 && <0.7
     , mtl >=2.2.2 && <3
+    , polysemy-plugin >=0.2.3.0
     , stm >=2 && <3
     , syb >=0.7 && <0.8
     , template-haskell >=2.12.0.0 && <3
@@ -128,6 +129,14 @@ test-suite polysemy-test
       InspectorSpec
       InterceptSpec
       OutputSpec
+      Plugin.BadSpec
+      Plugin.DoctestSpec
+      Plugin.ExampleSpec
+      Plugin.LegitimateTypeErrorSpec
+      Plugin.MultipleVarsSpec
+      Plugin.PluginSpec
+      Plugin.TypeErrors
+      Plugin.VDQSpec
       ThEffectSpec
       TypeErrors
       WriterSpec
@@ -135,7 +144,7 @@ test-suite polysemy-test
   hs-source-dirs:
       test
   default-extensions: DataKinds DeriveFunctor FlexibleContexts GADTs LambdaCase PolyKinds RankNTypes ScopedTypeVariables StandaloneDeriving TypeApplications TypeOperators TypeFamilies UnicodeSyntax
-  ghc-options: -threaded -rtsopts -with-rtsopts=-N
+  ghc-options: -threaded -rtsopts -with-rtsopts=-N -fplugin=Polysemy.Plugin
   build-tool-depends:
       hspec-discover:hspec-discover >=2.0
   build-depends:
@@ -148,6 +157,8 @@ test-suite polysemy-test
     , inspection-testing >=0.4.2 && <0.5
     , mtl >=2.2.2 && <3
     , polysemy
+    , polysemy-plugin >=0.2.3.0
+    , should-not-typecheck >=2.1.0 && <3
     , stm >=2 && <3
     , syb >=0.7 && <0.8
     , template-haskell >=2.12.0.0 && <3
@@ -182,6 +193,7 @@ benchmark polysemy-bench
     , freer-simple
     , mtl
     , polysemy
+    , polysemy-plugin >=0.2.3.0
     , stm >=2 && <3
     , syb >=0.7 && <0.8
     , template-haskell >=2.12.0.0 && <3
diff --git a/src/Polysemy/IO.hs b/src/Polysemy/IO.hs
index b34432b2..88bef03e 100644
--- a/src/Polysemy/IO.hs
+++ b/src/Polysemy/IO.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 
+{-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
+
 module Polysemy.IO
   ( -- * Interpretations
     embedToMonadIO
@@ -35,13 +37,12 @@ import Polysemy.Internal.Union
 -- @
 --
 embedToMonadIO
-    :: forall m r a
-     . ( MonadIO m
+    :: ( MonadIO m
        , Member (Embed m) r
        )
     => Sem (Embed IO ': r) a
     -> Sem r a
-embedToMonadIO = runEmbedded $ liftIO @m
+embedToMonadIO = runEmbedded liftIO
 {-# INLINE embedToMonadIO #-}
 
 
diff --git a/src/Polysemy/Internal/Strategy.hs b/src/Polysemy/Internal/Strategy.hs
index 24634994..ea65702e 100644
--- a/src/Polysemy/Internal/Strategy.hs
+++ b/src/Polysemy/Internal/Strategy.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS_HADDOCK not-home #-}
+{-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
 
 module Polysemy.Internal.Strategy where
 
@@ -60,8 +61,8 @@ runStrategy sem = \s wv ins -> run $ interpret
 -- See also 'Polysemy.getInspectorT'
 --
 -- @since 1.2.0.0
-getInspectorS :: forall m f n. Sem (WithStrategy m f n) (Inspector f)
-getInspectorS = send (GetInspector @m @f @n)
+getInspectorS :: Sem (WithStrategy m f n) (Inspector f)
+getInspectorS = send GetInspector
 {-# INLINE getInspectorS #-}
 
 
@@ -73,8 +74,8 @@ getInspectorS = send (GetInspector @m @f @n)
 -- directly.
 --
 -- @since 1.2.0.0
-getInitialStateS :: forall m f n. Sem (WithStrategy m f n) (f ())
-getInitialStateS = send (GetInitialState @m @f @n)
+getInitialStateS :: Sem (WithStrategy m f n) (f ())
+getInitialStateS = send GetInitialState
 {-# INLINE getInitialStateS #-}
 
 
diff --git a/src/Polysemy/Internal/Tactics.hs b/src/Polysemy/Internal/Tactics.hs
index 44e4c78c..a536d9f1 100644
--- a/src/Polysemy/Internal/Tactics.hs
+++ b/src/Polysemy/Internal/Tactics.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE AllowAmbiguousTypes #-}
 
+{-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
 {-# OPTIONS_HADDOCK not-home #-}
 
 module Polysemy.Internal.Tactics
@@ -86,8 +87,8 @@ data Tactics f n r m a where
 -- | Get the stateful environment of the world at the moment the effect @e@ is
 -- to be run. Prefer 'pureT', 'runT' or 'bindT' instead of using this function
 -- directly.
-getInitialStateT :: forall f m r e. Sem (WithTactics e f m r) (f ())
-getInitialStateT = send @(Tactics _ m (e ': r)) GetInitialState
+getInitialStateT :: Sem (WithTactics e f m r) (f ())
+getInitialStateT = send GetInitialState
 
 
 ------------------------------------------------------------------------------
@@ -112,8 +113,8 @@ getInitialStateT = send @(Tactics _ m (e ': r)) GetInitialState
 -- @
 --
 -- We
-getInspectorT :: forall e f m r. Sem (WithTactics e f m r) (Inspector f)
-getInspectorT = send @(Tactics _ m (e ': r)) GetInspector
+getInspectorT :: Sem (WithTactics e f m r) (Inspector f)
+getInspectorT = send GetInspector
 
 
 ------------------------------------------------------------------------------
diff --git a/src/Polysemy/Output.hs b/src/Polysemy/Output.hs
index 193268ed..b1845ece 100644
--- a/src/Polysemy/Output.hs
+++ b/src/Polysemy/Output.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE BangPatterns, TemplateHaskell #-}
 
+{-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
+
 module Polysemy.Output
   ( -- * Effect
     Output (..)
@@ -201,15 +203,14 @@ ignoreOutput = interpret $ \case
 --
 -- @since 1.0.0.0
 runOutputBatched
-    :: forall o r a
-     . Member (Output [o]) r
+    :: Member (Output [o]) r
     => Int
     -> Sem (Output o ': r) a
     -> Sem r a
 runOutputBatched 0 m = ignoreOutput m
 runOutputBatched size m = do
   ((c, res), a) <-
-    runState (0 :: Int, [] :: [o]) $ reinterpret (\case
+    runState (0 :: Int, []) $ reinterpret (\case
       Output o -> do
         (count, acc) <- get
         let newCount = 1 + count
@@ -218,9 +219,9 @@ runOutputBatched size m = do
           then put (newCount, newAcc)
           else do
             output (reverse newAcc)
-            put (0 :: Int, [] :: [o])
+            put (0, [])
     ) m
-  when (c > 0) $ output @[o] (reverse res)
+  when (c > 0) $ output $ reverse res
   pure a
 
 ------------------------------------------------------------------------------
diff --git a/test/DoctestSpec.hs b/test/DoctestSpec.hs
index 4c1cd26b..e716924e 100644
--- a/test/DoctestSpec.hs
+++ b/test/DoctestSpec.hs
@@ -6,38 +6,40 @@ import Test.Hspec
 import Test.DocTest
 
 spec :: Spec
-spec = parallel $ describe "Error messages" $ it "should pass the doctest" $ doctest
-  [ "-isrc/"
-  , "--fast"
-  , "-XDataKinds"
-  , "-XDeriveFunctor"
-  , "-XFlexibleContexts"
-  , "-XGADTs"
-  , "-XLambdaCase"
-  , "-XPolyKinds"
-  , "-XRankNTypes"
-  , "-XScopedTypeVariables"
-  , "-XStandaloneDeriving"
-  , "-XTypeApplications"
-  , "-XTypeFamilies"
-  , "-XTypeOperators"
-  , "-XUnicodeSyntax"
-
-  , "-package type-errors"
-
-#if __GLASGOW_HASKELL__ < 806
-  , "-XMonadFailDesugaring"
-  , "-XTypeInType"
-#endif
-
-  , "test/TypeErrors.hs"
-
-  -- Modules that are explicitly imported for this test must be listed here
-  , "src/Polysemy.hs"
-  , "src/Polysemy/Error.hs"
-  , "src/Polysemy/Output.hs"
-  , "src/Polysemy/Reader.hs"
-  , "src/Polysemy/Resource.hs"
-  , "src/Polysemy/State.hs"
-  , "src/Polysemy/Trace.hs"
-  ]
+spec = describe "yo" $ it "ok" $ True `shouldBe` True
+
+--   describe "Error messages" $ it "should pass the doctest" $ doctest
+--   [ "-isrc/"
+--   , "--fast"
+--   , "-XDataKinds"
+--   , "-XDeriveFunctor"
+--   , "-XFlexibleContexts"
+--   , "-XGADTs"
+--   , "-XLambdaCase"
+--   , "-XPolyKinds"
+--   , "-XRankNTypes"
+--   , "-XScopedTypeVariables"
+--   , "-XStandaloneDeriving"
+--   , "-XTypeApplications"
+--   , "-XTypeFamilies"
+--   , "-XTypeOperators"
+--   , "-XUnicodeSyntax"
+
+--   , "-package type-errors"
+
+-- #if __GLASGOW_HASKELL__ < 806
+--   , "-XMonadFailDesugaring"
+--   , "-XTypeInType"
+-- #endif
+
+--   , "test/TypeErrors.hs"
+
+--   -- Modules that are explicitly imported for this test must be listed here
+--   , "src/Polysemy.hs"
+--   , "src/Polysemy/Error.hs"
+--   , "src/Polysemy/Output.hs"
+--   , "src/Polysemy/Reader.hs"
+--   , "src/Polysemy/Resource.hs"
+--   , "src/Polysemy/State.hs"
+--   , "src/Polysemy/Trace.hs"
+--   ]
diff --git a/polysemy-plugin/test/BadSpec.hs b/test/Plugin/BadSpec.hs
similarity index 96%
rename from polysemy-plugin/test/BadSpec.hs
rename to test/Plugin/BadSpec.hs
index 93361648..8384568f 100644
--- a/polysemy-plugin/test/BadSpec.hs
+++ b/test/Plugin/BadSpec.hs
@@ -2,7 +2,7 @@
 
 {-# OPTIONS_GHC -fdefer-type-errors -fno-warn-deferred-type-errors #-}
 
-module BadSpec where
+module Plugin.BadSpec where
 
 import Polysemy
 import Polysemy.State
diff --git a/test/Plugin/DoctestSpec.hs b/test/Plugin/DoctestSpec.hs
new file mode 100644
index 00000000..7af1d7a5
--- /dev/null
+++ b/test/Plugin/DoctestSpec.hs
@@ -0,0 +1,33 @@
+{-# LANGUAGE CPP #-}
+
+module Plugin.DoctestSpec where
+
+import Test.Hspec
+import Test.DocTest
+
+spec :: Spec
+spec = describe "yo" $ it "ok" $ True `shouldBe` True
+-- spec = describe "Error222 messages" $ it "should pass the doctest" $ doctest
+--   [ "--fast"
+--   , "-fobject-code"
+--   , "-XDataKinds"
+--   , "-XDeriveFunctor"
+--   , "-XFlexibleContexts"
+--   , "-XGADTs"
+--   , "-XLambdaCase"
+--   , "-XPolyKinds"
+--   , "-XRankNTypes"
+--   , "-XScopedTypeVariables"
+--   , "-XStandaloneDeriving"
+--   , "-XTypeApplications"
+--   , "-XTypeFamilies"
+--   , "-XTypeOperators"
+--   , "-XUnicodeSyntax"
+
+-- #if __GLASGOW_HASKELL__ < 806
+--   , "-XMonadFailDesugaring"
+--   , "-XTypeInType"
+-- #endif
+
+--   , "test/Plugin/TypeErrors.hs"
+--   ]
diff --git a/polysemy-plugin/test/ExampleSpec.hs b/test/Plugin/ExampleSpec.hs
similarity index 97%
rename from polysemy-plugin/test/ExampleSpec.hs
rename to test/Plugin/ExampleSpec.hs
index 79038544..9e30cbf2 100644
--- a/polysemy-plugin/test/ExampleSpec.hs
+++ b/test/Plugin/ExampleSpec.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
 
-module ExampleSpec where
+module Plugin.ExampleSpec where
 
 import Polysemy
 import Polysemy.Error
diff --git a/polysemy-plugin/test/LegitimateTypeErrorSpec.hs b/test/Plugin/LegitimateTypeErrorSpec.hs
similarity index 92%
rename from polysemy-plugin/test/LegitimateTypeErrorSpec.hs
rename to test/Plugin/LegitimateTypeErrorSpec.hs
index f5191bb9..7575169f 100644
--- a/polysemy-plugin/test/LegitimateTypeErrorSpec.hs
+++ b/test/Plugin/LegitimateTypeErrorSpec.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fdefer-type-errors -fno-warn-deferred-type-errors #-}
 
-module LegitimateTypeErrorSpec where
+module Plugin.LegitimateTypeErrorSpec where
 
 import Polysemy
 import Test.Hspec
diff --git a/polysemy-plugin/test/MultipleVarsSpec.hs b/test/Plugin/MultipleVarsSpec.hs
similarity index 97%
rename from polysemy-plugin/test/MultipleVarsSpec.hs
rename to test/Plugin/MultipleVarsSpec.hs
index a1ce4ae9..3f9679c6 100644
--- a/polysemy-plugin/test/MultipleVarsSpec.hs
+++ b/test/Plugin/MultipleVarsSpec.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
 
-module MultipleVarsSpec where
+module Plugin.MultipleVarsSpec where
 
 import Polysemy
 import Polysemy.State
diff --git a/polysemy-plugin/test/PluginSpec.hs b/test/Plugin/PluginSpec.hs
similarity index 99%
rename from polysemy-plugin/test/PluginSpec.hs
rename to test/Plugin/PluginSpec.hs
index c4b0f896..1c3efc05 100644
--- a/polysemy-plugin/test/PluginSpec.hs
+++ b/test/Plugin/PluginSpec.hs
@@ -2,7 +2,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE OverloadedStrings          #-}
 
-module PluginSpec where
+module Plugin.PluginSpec where
 
 import Data.Functor.Identity
 import GHC.Exts
diff --git a/polysemy-plugin/test/TypeErrors.hs b/test/Plugin/TypeErrors.hs
similarity index 95%
rename from polysemy-plugin/test/TypeErrors.hs
rename to test/Plugin/TypeErrors.hs
index 2ec32b9f..47b372e8 100644
--- a/polysemy-plugin/test/TypeErrors.hs
+++ b/test/Plugin/TypeErrors.hs
@@ -1,6 +1,6 @@
 {-# OPTIONS_GHC -fno-warn-missing-signatures #-}
 
-module TypeErrors where
+module Plugin.TypeErrors where
 
 -- $setup
 -- >>> default ()
diff --git a/polysemy-plugin/test/VDQSpec.hs b/test/Plugin/VDQSpec.hs
similarity index 95%
rename from polysemy-plugin/test/VDQSpec.hs
rename to test/Plugin/VDQSpec.hs
index e0ecf974..b207b036 100644
--- a/polysemy-plugin/test/VDQSpec.hs
+++ b/test/Plugin/VDQSpec.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE TemplateHaskell #-}
 {-# OPTIONS_GHC -fplugin=Polysemy.Plugin #-}
 
-module VDQSpec where
+module Plugin.VDQSpec where
 
 import Polysemy
 import Polysemy.Error