Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision 0df292b04fcd4abcd8d5a0f73a254c33e6494808)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -10,6 +10,6 @@
 // Created On       : Sat May 16 23:52:08 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 22 17:19:54 2015
-// Update Count     : 17
+// Last Modified On : Fri Jul  3 17:58:39 2015
+// Update Count     : 22
 //
 
@@ -543,8 +543,12 @@
 
 		AlternativeFinder funcFinder( indexer, env ); {
-			NameExpr *fname;
+			NameExpr *fname = 0;;
 			if ( ( fname = dynamic_cast<NameExpr *>( untypedExpr->get_function()))
 				 && ( fname->get_name() == std::string("&&")) ) {
-				alternatives.push_back( Alternative( untypedExpr->clone(), env, Cost()) );
+				VoidType v = Type::Qualifiers();		// resolve to type void *
+				PointerType pt( Type::Qualifiers(), v.clone() );
+				UntypedExpr *vexpr = untypedExpr->clone();
+				vexpr->get_results().push_front( pt.clone() );
+				alternatives.push_back( Alternative( vexpr, env, Cost()) );
 				return;
 			}
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 0df292b04fcd4abcd8d5a0f73a254c33e6494808)
+++ src/ResolvExpr/Resolver.cc	(revision 2871210d7be1910f7296a17164d525f66ef82648)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 24 16:20:35 2015
-// Update Count     : 156
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Fri Jul  3 16:18:20 2015
+// Update Count     : 159
 //
 
@@ -274,5 +274,5 @@
 		// must resolve the argument for a computed goto
 		if ( branchStmt->get_type() == BranchStmt::Goto ) { // check for computed goto statement
-			if ( NameExpr * arg = dynamic_cast< NameExpr * >( branchStmt->get_computedTarget() ) ) {
+			if ( Expression * arg = branchStmt->get_computedTarget() ) {
 				VoidType v = Type::Qualifiers();		// cast to void * for the alternative finder
 				PointerType pt( Type::Qualifiers(), v.clone() );