--- a/stage3/visit_expression_type.cc	Fri Jun 10 08:47:38 2011 +0100
+++ b/stage3/visit_expression_type.cc	Tue Jun 14 14:53:37 2011 +0100
@@ -910,7 +910,7 @@
 /*********************/
 
 void *visit_expression_type_c::visit(symbolic_variable_c *symbol) {
-  return search_varfb_instance_type->get_type(symbol);
+  return search_varfb_instance_type->get_basetype_decl(symbol);
 }
 
 /********************************************/
@@ -937,11 +937,11 @@
 /* B 1.4.2 - Multi-element variables */
 /*************************************/
 void *visit_expression_type_c::visit(array_variable_c *symbol) {
-  return search_varfb_instance_type->get_type(symbol);
+  return search_varfb_instance_type->get_basetype_decl(symbol);
 }
 
 void *visit_expression_type_c::visit(structured_variable_c *symbol) {
-  return search_varfb_instance_type->get_type(symbol);
+  return search_varfb_instance_type->get_basetype_decl(symbol);
 }
 
 
@@ -1130,12 +1130,12 @@
    *         fb1(...)
    *       End_Program
    *
-   *    search_varfb_instance_type->get_type( identifier_c("fb1") )
+   *    search_varfb_instance_type->get_basetype_decl( identifier_c("fb1") )
    *    in the scope of Program 'test'
    *    will return the fb declaration of foo_fb_type !!
    */
 #if 0
-  symbol_c *fb_decl_symbol = search_varfb_instance_type->get_type(symbol->fb_name);
+  symbol_c *fb_decl_symbol = search_varfb_instance_type->get_basetype_decl(symbol->fb_name);
     /* The following should never occur. The function block must be defined, 
      * and the FB type being called MUST be in the symtable... 
      * This was all already checked at stage 2!
@@ -1146,7 +1146,7 @@
     /* should never occur. ... */
   if (NULL == fb_decl) ERROR;
 #endif
-  symbol_c *fb_decl = search_varfb_instance_type->get_type(symbol->fb_name);
+  symbol_c *fb_decl = search_varfb_instance_type->get_basetype_decl(symbol->fb_name);
     /* The following should never occur. The function block must be defined, 
      * and the FB type being called MUST be in the symtable... 
      * This was all already checked at stage 2!
@@ -2040,7 +2040,7 @@
 /* param_assignment_list -> may be NULL ! */
 // SYM_REF3(fb_invocation_c, fb_name, formal_param_list, nonformal_param_list)
 void *visit_expression_type_c::visit(fb_invocation_c *symbol) {
-  symbol_c *fb_decl = search_varfb_instance_type->get_type(symbol->fb_name);
+  symbol_c *fb_decl = search_varfb_instance_type->get_basetype_decl(symbol->fb_name);
     /* The following should never occur. The function block must be defined, 
      * and the FB type being called MUST be in the symtable... 
      * This was all already checked at stage 2!