Index: src/ResolvExpr/AlternativeFinder.cc
===================================================================
--- src/ResolvExpr/AlternativeFinder.cc	(revision fbcb35488c190b8e3845a1a9572c9c931586897f)
+++ src/ResolvExpr/AlternativeFinder.cc	(revision bb31ee6cb2268c63a86fb450f60857c0f0e91b7f)
@@ -698,16 +698,4 @@
 
 	void AlternativeFinder::visit( UntypedExpr *untypedExpr ) {
-		{
-			std::string fname = InitTweak::getFunctionName( untypedExpr );
-			if ( fname == "&&" ) {
-				VoidType v = Type::Qualifiers();		// resolve to type void *
-				PointerType pt( Type::Qualifiers(), v.clone() );
-				UntypedExpr *vexpr = untypedExpr->clone();
-				vexpr->set_result( pt.clone() );
-				alternatives.push_back( Alternative( vexpr, env, Cost::zero) );
-				return;
-			}
-		}
-
 		AlternativeFinder funcFinder( indexer, env );
 		funcFinder.findWithAdjustment( untypedExpr->get_function() );
@@ -856,4 +844,8 @@
 			} // if
 		} // for
+	}
+
+	void AlternativeFinder::visit( LabelAddressExpr * expr ) {
+		alternatives.push_back( Alternative( expr->clone(), env, Cost::zero) );
 	}
 
Index: src/ResolvExpr/AlternativeFinder.h
===================================================================
--- src/ResolvExpr/AlternativeFinder.h	(revision fbcb35488c190b8e3845a1a9572c9c931586897f)
+++ src/ResolvExpr/AlternativeFinder.h	(revision bb31ee6cb2268c63a86fb450f60857c0f0e91b7f)
@@ -54,4 +54,5 @@
 		virtual void visit( UntypedExpr *untypedExpr );
 		virtual void visit( AddressExpr *addressExpr );
+		virtual void visit( LabelAddressExpr *labelExpr );
 		virtual void visit( CastExpr *castExpr );
 		virtual void visit( VirtualCastExpr *castExpr );