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

IPython/core/alias.py

@@ -169,13 +169,12 b' class Alias(object):'
         if cmd.find('%l') >= 0:
             cmd = cmd.replace('%l', rest)
             rest = ''
-         
-        if cmd.find('%%s') >= 1:
-            cmd = cmd.replace('%%s', '%s')
-            
+		
         if nargs==0:
-            # Simple, argument-less aliases
-            cmd = '%s %s' % (cmd, rest)
+			if cmd.find('%%s') >= 1:
+				cmd = cmd.replace('%%s', '%s')
+			# Simple, argument-less aliases
+			cmd = '%s %s' % (cmd, rest)
         else:
             # Handle aliases with positional arguments
             args = rest.split(None, nargs)