diff --git a/app/Main.hs b/app/Main.hs
--- a/app/Main.hs
+++ b/app/Main.hs
@@ -1,6 +1,7 @@
 module Main (main) where
 
 import           Control.Monad
+import           Data.Bool             (bool)
 import           Data.Foldable
 import           Data.Version          (showVersion)
 import           Language.C.Dependency
@@ -8,18 +9,18 @@
 import           Paths_cdeps           (version)
 
 includes' :: Parser [FilePath]
-includes' = many $ strOption $ mconcat
-    [ long "include"
-    , short 'I'
-    , help "Directories for inclusions."
-    ]
+includes' = many $ strOption
+    (long "include"
+    <> metavar "DIR"
+    <> short 'I'
+    <> help "Directories for inclusions."
+    <> dirCompletions)
 
 noRecurse :: Parser Bool
-noRecurse = switch $ mconcat
-    [ long "no-recurse"
-    , short 'r'
-    , help "Do not search for dependencies recursively."
-    ]
+noRecurse = switch
+    (long "no-recurse"
+    <> short 'r'
+    <> help "Do not search for dependencies recursively.")
 
 data Command = Dump FilePath [FilePath] Bool
 
@@ -29,7 +30,10 @@
     <*> includes'
     <*> noRecurse
 
-cCompletions :: Mod ArgumentFields a
+dirCompletions :: HasCompleter f => Mod f a
+dirCompletions = action "directory"
+
+cCompletions :: HasCompleter f => Mod f a
 cCompletions = completer . bashCompleter $ "file -X '!*.c' -o plusdirs"
 
 target :: Parser FilePath
@@ -38,12 +42,9 @@
     <> help "C source file"
     <> cCompletions)
 
-go :: ([FilePath] -> FilePath -> IO [FilePath]) -> [FilePath] -> FilePath -> IO ()
-go = ((traverse_ putStrLn <=<) .)
-
 run :: Command -> IO ()
-run (Dump cSrc is False) = go getAll is cSrc
-run (Dump cSrc is True)  = go getCDepends is cSrc
+run (Dump cSrc is nr) = (traverse_ putStrLn <=< go is) cSrc
+    where go = bool getAll getCDepends nr
 
 versionInfo :: Parser (a -> a)
 versionInfo = infoOption ("cdeps version: " ++ showVersion version) (short 'V' <> long "version" <> help "Show version")
diff --git a/cdeps.cabal b/cdeps.cabal
--- a/cdeps.cabal
+++ b/cdeps.cabal
@@ -1,6 +1,6 @@
 cabal-version: 1.18
 name: cdeps
-version: 0.1.1.6
+version: 0.1.1.7
 license: BSD3
 license-file: LICENSE
 copyright: Copyright: (c) 2018 Vanessa McHale