diff --git a/Annex.hs b/Annex.hs
index 22fd1b8748..91d374aec3 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -64,6 +64,8 @@ instance MonadBaseControl IO Annex where
 
 data OutputType = NormalOutput | QuietOutput | JSONOutput
 
+type Matcher a = Either [Utility.Matcher.Token a] (Utility.Matcher.Matcher a)
+
 -- internal state storage
 data AnnexState = AnnexState
 	{ repo :: Git.Repo
@@ -81,7 +83,7 @@ data AnnexState = AnnexState
 	, forcenumcopies :: Maybe Int
 	, toremote :: Maybe String
 	, fromremote :: Maybe String
-	, limit :: Either [Utility.Matcher.Token (FilePath -> Annex Bool)] (Utility.Matcher.Matcher (FilePath -> Annex Bool))
+	, limit :: Matcher (FilePath -> Annex Bool)
 	, forcetrust :: [(UUID, TrustLevel)]
 	, trustmap :: Maybe TrustMap
 	, ciphers :: M.Map EncryptedCipher Cipher