diff --git a/src/Parser.h b/src/Parser.h
index 074ee0e50..27491b0cf 100644
--- a/src/Parser.h
+++ b/src/Parser.h
@@ -48,6 +48,7 @@ public:
   bool canonicalize (std::string&, const std::string&, const std::string&) const;
 
   void findBinary ();
+  void resolveAliases ();
   void findOverrides ();
   void findCommand ();
   void findIdSequence ();
@@ -68,7 +69,6 @@ public:
 
 private:
   void findTerminator ();
-  void resolveAliases ();
   void findPattern ();
   void findSubstitution ();
   void findTag ();
diff --git a/src/args.cpp b/src/args.cpp
index b8524a8e6..6aadaa554 100644
--- a/src/args.cpp
+++ b/src/args.cpp
@@ -40,9 +40,6 @@ int main (int argc, const char** argv)
     parser.appendStdin ();
     parser.findOverrides ();
 
-    Alias alias;
-    alias.resolve (parser.tree ());
-
     // Read-only commands.
     parser.entity ("cmd", "active");           parser.entity ("readcmd", "active");
     parser.entity ("cmd", "all");              parser.entity ("readcmd", "all");
diff --git a/src/commands/CmdAliases.cpp b/src/commands/CmdAliases.cpp
index 52420bbd2..77872309b 100644
--- a/src/commands/CmdAliases.cpp
+++ b/src/commands/CmdAliases.cpp
@@ -25,9 +25,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <cmake.h>
-#include <sstream>
-#include <algorithm>
-#include <stdlib.h>
 #include <Context.h>
 #include <Command.h>
 #include <CmdAliases.h>
@@ -48,22 +45,11 @@ CmdCompletionAliases::CmdCompletionAliases ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdCompletionAliases::execute (std::string& output)
 {
-  // Get a list of all aliases.
-  std::vector <std::string> aliases;
+  std::map <std::string, std::string>::iterator alias;
+  for (alias = context.config.begin (); alias != context.config.end (); ++alias)
+    if (alias->first.substr (0, 6) == "alias.")
+      output += alias->first.substr (6) + "\n";
 
-  std::map <std::string, std::string>::iterator it;
-  for (it = context.alias._aliases.begin (); it != context.alias._aliases.end (); ++it)
-    aliases.push_back (it->first);
-
-  // Sort alphabetically.
-  std::sort (aliases.begin (), aliases.end ());
-
-  std::stringstream out;
-  std::vector <std::string>::iterator a;
-  for (a = aliases.begin (); a != aliases.end (); ++a)
-    out << *a << "\n";
-
-  output = out.str ();
   return 0;
 }
 
diff --git a/src/commands/CmdHelp.cpp b/src/commands/CmdHelp.cpp
index 25fcc1213..b3f2e36ac 100644
--- a/src/commands/CmdHelp.cpp
+++ b/src/commands/CmdHelp.cpp
@@ -97,13 +97,14 @@ int CmdHelp::execute (std::string& output)
   view.set (row, 1, " ");
 
   std::map <std::string, std::string>::iterator alias;
-  for (alias =  context.alias._aliases.begin ();
-       alias != context.alias._aliases.end ();
-       ++alias)
+  for (alias = context.config.begin (); alias != context.config.end (); ++alias)
   {
-    row = view.addRow ();
-    view.set (row, 1, alias->first);
-    view.set (row, 2, format (STRING_CMD_HELP_ALIASED, alias->second));
+    if (alias->first.substr (0, 6) == "alias.")
+    {
+      row = view.addRow ();
+      view.set (row, 1, alias->first.substr (6));
+      view.set (row, 2, format (STRING_CMD_HELP_ALIASED, alias->second));
+    }
   }
 
   output = "\n"