--- a/util/dsymtable.cc	Fri Dec 26 09:57:02 2014 +0000
+++ b/util/dsymtable.cc	Fri Dec 26 10:09:27 2014 +0000
@@ -38,22 +38,22 @@
 
 
  /* clear all entries... */
-template<typename value_type, value_type null_value>
-void dsymtable_c<value_type, null_value>::reset(void) {
+template<typename value_type>
+void dsymtable_c<value_type>::reset(void) {
   _base.clear();
 }
 
 
-template<typename value_type, value_type null_value>
-void dsymtable_c<value_type, null_value>::insert(const char *identifier_str, value_t new_value) {
+template<typename value_type>
+void dsymtable_c<value_type>::insert(const char *identifier_str, value_t new_value) {
   // std::cout << "store_identifier(" << identifier_str << "): \n";
   std::pair<const char *, value_t> new_element(identifier_str, new_value);
   /* iterator res = */ _base.insert(new_element);
 }
 
 
-template<typename value_type, value_type null_value>
-void dsymtable_c<value_type, null_value>::insert(const symbol_c *symbol, value_t new_value) {
+template<typename value_type>
+void dsymtable_c<value_type>::insert(const symbol_c *symbol, value_t new_value) {
   const token_c *name = dynamic_cast<const token_c *>(symbol);
   if (name == NULL)
     ERROR;
@@ -62,8 +62,8 @@
 
 
 #if 0
-template<typename value_type, value_type null_value>
-void dsymtable_c<value_type, null_value>::insert_noduplicate(const char *identifier_str, value_t new_value) {
+template<typename value_type>
+void dsymtable_c<value_type>::insert_noduplicate(const char *identifier_str, value_t new_value) {
   if (find_value(identifier_str) != null_value)
     /* already present in the set! */
     ERROR;
@@ -74,8 +74,8 @@
 }
 
 
-template<typename value_type, value_type null_value>
-void dsymtable_c<value_type, null_value>::insert_noduplicate(const symbol_c *symbol, value_t new_value) {
+template<typename value_type>
+void dsymtable_c<value_type>::insert_noduplicate(const symbol_c *symbol, value_t new_value) {
   const token_c *name = dynamic_cast<const token_c *>(symbol);
   if (name == NULL)
     ERROR;
@@ -86,20 +86,8 @@
 
 
 
-/* returns null_value if not found! */
-template<typename value_type, value_type null_value>
-value_type dsymtable_c<value_type, null_value>::find_value(const char *identifier_str) {
-  iterator i = _base.find(identifier_str);
-
-  if (i == _base.end())
-    return null_value;
-  else
-    return i->second;
-}
-
-
-template<typename value_type, value_type null_value>
-const char * dsymtable_c<value_type, null_value>::symbol_to_string(const symbol_c *symbol) {
+template<typename value_type>
+const char * dsymtable_c<value_type>::symbol_to_string(const symbol_c *symbol) {
   const token_c *name = dynamic_cast<const token_c *>(symbol);
   if (name == NULL)
     ERROR;
@@ -108,8 +96,8 @@
 
 
 /* debuging function... */
-template<typename value_type, value_type null_value>
-void dsymtable_c<value_type, null_value>::print(void) {
+template<typename value_type>
+void dsymtable_c<value_type>::print(void) {
   for(iterator i = _base.begin();
       i != _base.end();
       i++)