test suite found a problem with today's work

". def" did not do what I thought it would, at all.

Locations.hs

@@ -426,4 +426,4 @@ keyPath key hasher = hasher key </> f </> f
  - special remotes and git-annex repos.
  -}
 keyPaths :: Key -> [FilePath]
-keyPaths key = map (keyPath key . def) dirHashes
+keyPaths key = map (\h -> keyPath key (h def)) dirHashes

Remote/Rsync.hs

@@ -213,8 +213,8 @@ remove o k = do
 	 - content could be. Note that the parent directories have
 	 - to also be explicitly included, due to how rsync
 	 - traverses directories. -}
-	includes = concatMap (use .def) dirHashes
-	use h = let dir = h k in
+	includes = concatMap use dirHashes
+	use h = let dir = h def k in
 		[ parentDir dir
 		, dir
 		-- match content directory and anything in it

Remote/Rsync/RsyncUrl.hs

@@ -37,12 +37,12 @@ rsyncEscape o u
 	| otherwise = u
 
 rsyncUrls :: RsyncOpts -> Key -> [RsyncUrl]
-rsyncUrls o k = map (use . def) dirHashes
+rsyncUrls o k = map use dirHashes
   where
 	use h = rsyncUrl o </> hash h </> rsyncEscape o (f </> f)
 	f = keyFile k
 #ifndef mingw32_HOST_OS
-	hash h = h k
+	hash h = h def k
 #else
 	hash h = replace "\\" "/" (h k)
 #endif