diff -r 887e7d90445a -r 31e3b3f2eff1 absyntax_utils/search_varfb_instance_type.cc
--- a/absyntax_utils/search_varfb_instance_type.cc	Sun Oct 19 11:53:36 2014 +0100
+++ b/absyntax_utils/search_varfb_instance_type.cc	Sun Oct 19 21:30:58 2014 +0100
@@ -428,13 +428,6 @@
     current_basetype_id   = search_base_type_c::get_basetype_id  (ref_spec->type_name);
   }
   
-/* ########### WARNING ########################################################## */
-/* The following two lines DO NOT belong here. It is just a temporary measure until I get the chance 
- * to clean this up, and move it to fill/narrow candidate datatypes in stage 3 
- */
-  symbol->datatype = current_basetype_decl;
-  symbol->exp->datatype = ref_spec;
-  
   return NULL;
 }
 
@@ -454,12 +447,5 @@
     current_basetype_id   = search_base_type_c::get_basetype_id  (ref_spec->type_name);
   }
   
-/* ########### WARNING ########################################################## */
-/* The following two lines DO NOT belong here. It is just a temporary measure until I get the chance 
- * to clean this up, and move it to fill/narrow candidate datatypes in stage 3 
- */
-  symbol->datatype = current_basetype_decl;
-  symbol->exp->datatype = ref_spec;
-  
-  return NULL;
-}
+  return NULL;
+}