diff --git a/src/dobject.cpp b/src/dobject.cpp
index 2f5fd0cac..405c96514 100644
--- a/src/dobject.cpp
+++ b/src/dobject.cpp
@@ -389,9 +389,12 @@ void DObject::SerializeUserVars(FArchive &arc)
 		// Write all user variables.
 		for (; symt != NULL; symt = symt->ParentSymbolTable)
 		{
-			for (unsigned i = 0; i < symt->Symbols.Size(); ++i)
+			PSymbolTable::MapType::Iterator it(symt->Symbols);
+			PSymbolTable::MapType::Pair *pair;
+
+			while (it.NextPair(pair))
 			{
-				PSymbol *sym = symt->Symbols[i];
+				PSymbol *sym = pair->Value;
 				if (sym->SymbolType == SYM_Variable)
 				{
 					PSymbolVariable *var = static_cast<PSymbolVariable *>(sym);
diff --git a/src/dobjtype.cpp b/src/dobjtype.cpp
index 4e02dbba7..1649ca46a 100644
--- a/src/dobjtype.cpp
+++ b/src/dobjtype.cpp
@@ -481,11 +481,16 @@ PSymbolTable::~PSymbolTable ()
 
 size_t PSymbolTable::MarkSymbols()
 {
-	for (unsigned int i = 0; i < Symbols.Size(); ++i)
+	size_t count = 0;
+	MapType::Iterator it(Symbols);
+	MapType::Pair *pair;
+
+	while (it.NextPair(pair))
 	{
-		GC::Mark(Symbols[i]);
+		GC::Mark(pair->Value);
+		count++;
 	}
-	return Symbols.Size() * sizeof(Symbols[0]);
+	return count * sizeof(Symbols[0]);
 }
 
 void PSymbolTable::ReleaseSymbols()
@@ -502,64 +507,21 @@ void PSymbolTable::SetParentTable (PSymbolTable *parent)
 
 PSymbol *PSymbolTable::FindSymbol (FName symname, bool searchparents) const
 {
-	int min, max;
-
-	min = 0;
-	max = (int)Symbols.Size() - 1;
-
-	while (min <= max)
+	PSymbol * const *value = Symbols.CheckKey(symname);
+	if (value == NULL && searchparents && ParentSymbolTable != NULL)
 	{
-		unsigned int mid = (min + max) / 2;
-		PSymbol *sym = Symbols[mid];
-
-		if (sym->SymbolName == symname)
-		{
-			return sym;
-		}
-		else if (sym->SymbolName < symname)
-		{
-			min = mid + 1;
-		}
-		else
-		{
-			max = mid - 1;
-		}
+		return ParentSymbolTable->FindSymbol(symname, searchparents);
 	}
-	if (searchparents && ParentSymbolTable != NULL)
-	{
-		return ParentSymbolTable->FindSymbol (symname, true);
-	}
-	return NULL;
+	return value != NULL ? *value : NULL;
 }
 
 PSymbol *PSymbolTable::AddSymbol (PSymbol *sym)
 {
-	// Insert it in sorted order.
-	int min, max, mid;
-
-	min = 0;
-	max = (int)Symbols.Size() - 1;
-
-	while (min <= max)
+	// Symbols that already exist are not inserted.
+	if (Symbols.CheckKey(sym->SymbolName) != NULL)
 	{
-		mid = (min + max) / 2;
-		PSymbol *tsym = Symbols[mid];
-
-		if (tsym->SymbolName == sym->SymbolName)
-		{ // A symbol with this name already exists in the table
-			return NULL;
-		}
-		else if (tsym->SymbolName < sym->SymbolName)
-		{
-			min = mid + 1;
-		}
-		else
-		{
-			max = mid - 1;
-		}
+		return NULL;
 	}
-
-	// Good. The symbol is not in the table yet.
-	Symbols.Insert (MAX(min, max), sym);
+	Symbols.Insert(sym->SymbolName, sym);
 	return sym;
 }
diff --git a/src/dobjtype.h b/src/dobjtype.h
index 063c52a2c..1090d659e 100644
--- a/src/dobjtype.h
+++ b/src/dobjtype.h
@@ -141,8 +141,10 @@ struct PSymbolTable
 	void ReleaseSymbols();
 
 private:
+	typedef TMap<FName, PSymbol *> MapType;
+
 	PSymbolTable *ParentSymbolTable;
-	TArray<PSymbol *> Symbols;
+	MapType Symbols;
 
 	friend class DObject;
 };
diff --git a/src/zscript/zcc_parser.cpp b/src/zscript/zcc_parser.cpp
index 8e3abe942..fc1a0b35e 100644
--- a/src/zscript/zcc_parser.cpp
+++ b/src/zscript/zcc_parser.cpp
@@ -241,8 +241,10 @@ static void DoParse(const char *filename)
 	
 	parser = ZCCParseAlloc(malloc);
 	failed = false;
+#ifdef _DEBUG
 	FILE *f = fopen("trace.txt", "w");
 	ZCCParseTrace(f, "");
+#endif
 	while (sc.GetToken())
 	{
 		if (sc.TokenType == TK_StringConst)
@@ -294,10 +296,12 @@ static void DoParse(const char *filename)
 	ZCCParse(parser, ZCC_EOF, value, &sc);
 	ZCCParse(parser, 0, value, &sc);
 	ZCCParseFree(parser, free);
+#ifdef _DEBUG
 	if (f != NULL)
 	{
 		fclose(f);
 	}
+#endif
 }
 
 CCMD(parse)