Index: src/ResolvExpr/CastCost.cc
===================================================================
--- src/ResolvExpr/CastCost.cc	(revision 2a4b0884c14643e09650daaeb3a6667b5bff6b48)
+++ src/ResolvExpr/CastCost.cc	(revision 30aeb27024b481c431df7c2de351ebfb5e2348e5)
@@ -9,7 +9,7 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 06:57:43 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Oct 05 14:48:45 2015
-// Update Count     : 5
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Tue Feb  2 15:34:36 2016
+// Update Count     : 7
 //
 
@@ -69,5 +69,6 @@
 		PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
 		if ( destAsPointer && basicType->isInteger() ) {
-			cost = Cost( 1, 0, 0 );
+			//cost = Cost( 1, 0, 0 );
+			cost = Cost::infinity;
 		} else {
 			ConversionCost::visit( basicType );
@@ -87,10 +88,12 @@
 					cost = Cost( 0, 0, 1 );
 				} else if ( castResult < 0 ) {
-					cost = Cost( 1, 0, 0 );
+					cost = Cost::infinity;
+					//cost = Cost( 1, 0, 0 );
 				} // if
 			} // if
 		} else if ( BasicType *destAsBasic = dynamic_cast< BasicType* >( dest ) ) {
 			if ( destAsBasic->isInteger() ) {
-				cost = Cost( 1, 0, 0 );
+				//cost = Cost( 1, 0, 0 );
+				cost = Cost::infinity;
 			} // if
 		}
Index: src/ResolvExpr/Resolver.cc
===================================================================
--- src/ResolvExpr/Resolver.cc	(revision 2a4b0884c14643e09650daaeb3a6667b5bff6b48)
+++ src/ResolvExpr/Resolver.cc	(revision 30aeb27024b481c431df7c2de351ebfb5e2348e5)
@@ -10,6 +10,6 @@
 // Created On       : Sun May 17 12:17:01 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jul 24 17:33:54 2015
-// Update Count     : 178
+// Last Modified On : Tue Feb  9 21:57:52 2016
+// Update Count     : 179
 //
 
@@ -322,5 +322,5 @@
 												BasicType::SignedInt);
 				} else {
-					DeclarationWithType * decl = lookupId(n);
+					DeclarationWithType * decl = lookupId( n );
 					initContext = decl->get_type();
 				}
@@ -344,6 +344,5 @@
 					if ( PointerType * pt = dynamic_cast< PointerType *>( newExpr->get_results().front() ) ) {
 						if ( isCharType( pt->get_base() ) ) {
-							// strip cast if we're initializing a char[] with a char *, e.g.
-							// char x[] = "hello";
+							// strip cast if we're initializing a char[] with a char *, e.g.  char x[] = "hello";
 							CastExpr *ce = dynamic_cast< CastExpr * >( newExpr );
 							singleInit->set_value( ce->get_arg() );