diff --git a/src/Compiler.py b/src/Compiler.py
index c07f172a..ec7106b4 100644
--- a/src/Compiler.py
+++ b/src/Compiler.py
@@ -834,6 +834,7 @@ class CallDetails(object):
 
     def setCallArg(self, argName, lineCol):
         ID, callDetails = self._callRegionsStack[-1]
+        argName = str(argName)
         if callDetails.usesKeywordArgs:
             self._endCallArg()
         else:
diff --git a/src/Tests/SyntaxAndOutput.py b/src/Tests/SyntaxAndOutput.py
index 60c630a9..c67fdfa3 100644
--- a/src/Tests/SyntaxAndOutput.py
+++ b/src/Tests/SyntaxAndOutput.py
@@ -1,7 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: latin-1 -*-
-# $Id: SyntaxAndOutput.py,v 1.110 2008/03/10 07:50:18 tavis_rudd Exp $
-"""Syntax and Output tests.
+
+'''
+Syntax and Output tests.
 
 TODO
 - #finally
@@ -9,16 +10,7 @@
 - #errorCatcher
 - #echo
 - #silent
-
-Meta-Data
-================================================================================
-Author: Tavis Rudd <tavis@damnsimple.com>
-Version: $Revision: 1.110 $
-Start Date: 2001/03/30
-Last Revision Date: $Date: 2008/03/10 07:50:18 $
-"""
-__author__ = "Tavis Rudd <tavis@damnsimple.com>"
-__revision__ = "$Revision: 1.110 $"[11:-2]
+'''
 
 
 ##################################################
@@ -31,6 +23,7 @@
 import os
 import os.path
 import new
+import pdb
 import warnings
 
 from Cheetah.NameMapper import NotFound