Fixed error stemming from mixed args and 'commented out' args

IPython/core/alias.py

@@ -170,10 +170,9 b' class Alias(object):'
             cmd = cmd.replace('%l', rest)
             rest = ''
          
+        if nargs==0:
         if cmd.find('%%s') >= 1:
             cmd = cmd.replace('%%s', '%s')
-            
-        if nargs==0:
             # Simple, argument-less aliases
             cmd = '%s %s' % (cmd, rest)
         else: