Index: src/GenPoly/BoxNew.cpp
===================================================================
--- src/GenPoly/BoxNew.cpp	(revision d3652dff49964cd0e31a788e5a2cfb4c84d10393)
+++ src/GenPoly/BoxNew.cpp	(revision 4604bf56d050ff3c2749ece641e74766fd192965)
@@ -94,5 +94,5 @@
 
 /// Adds parameters for otype size and alignment to a function type.
-void addOTypeParams(
+void addSTypeParams(
 		ast::FunctionDecl * decl,
 		ast::vector<ast::TypeDecl> const & sizedParams ) {
@@ -246,5 +246,5 @@
 	ast::ObjectDecl const * offsetofParam = layout.offsetofParam;
 	assert( nullptr != layout.offsetofParam );
-	addOTypeParams( layoutDecl, sizedParams );
+	addSTypeParams( layoutDecl, sizedParams );
 
 	// Calculate structure layout in function body.
@@ -320,5 +320,5 @@
 	ast::ObjectDecl const * alignofParam = layout.alignofParam;
 	assert( nullptr == layout.offsetofParam );
-	addOTypeParams( layoutDecl, sizedParams );
+	addSTypeParams( layoutDecl, sizedParams );
 
 	// Calculate union layout in function body.
@@ -641,8 +641,6 @@
 	// the variable can be reused as a parameter to the call rather than
 	// creating a new temporary variable. Previously this step was an
-	// optimization, but
-	// ...
-	// with the introduction of tuples and UniqueExprs, it is necessary to
-	// ensure that they use the same variable.
+	// optimization, but with the introduction of tuples and UniqueExprs,
+	// it is necessary to ensure that they use the same variable.
 	// Essentially, looking for pattern:
 	// (x=f(...), x)
@@ -689,5 +687,4 @@
 	// the distinction between _conc_T30 and T3(int)) concRetType may not be
 	// a good name in one or both of these places.
-	// TODO A more appropriate name change is welcome.
 	if ( dynRetType ) {
 		ast::Type const * result = mutExpr->result;
@@ -698,9 +695,4 @@
 	} else if ( needsAdapter( function, scopeTypeVars )
 			&& !needsAdapter( function, exprTypeVars ) ) {
-		// TODO:
-		// The !needsAdapter check may be incorrect. It seems there is some
-		// situation where an adapter is applied where it shouldn't be,
-		// and this fixes it for some case. More investigation is needed.
-
 		// Change the application so it calls the adapter rather than the
 		// passed function.
@@ -1774,5 +1766,5 @@
 	/// Adds type parameters to the layout call; will generate the
 	/// appropriate parameters if needed.
-	void addOTypeParamsToLayoutCall(
+	void addSTypeParamsToLayoutCall(
 		ast::UntypedExpr * layoutCall,
 		const ast::vector<ast::Type> & otypeParams );
@@ -2014,7 +2006,6 @@
 		ast::MemberExpr const * expr ) {
 	// Only mutate member expressions for polymorphic types.
-	int typeDepth;
 	ast::Type const * objectType = hasPolyBase(
-		expr->aggregate->result, scopeTypeVars, &typeDepth
+		expr->aggregate->result, scopeTypeVars
 	);
 	if ( !objectType ) return expr;
@@ -2094,5 +2085,5 @@
 	}
 	// MemberExpr was converted to pointer + offset; and it is not valid C to
-	// take the address of an addition, so stript the address-of.
+	// take the address of an addition, so strip away the address-of.
 	// It also preserves the env value.
 	return ast::mutate_field( expr->arg.get(), &ast::Expr::env, expr->env );
@@ -2295,5 +2286,5 @@
 				} );
 
-			addOTypeParamsToLayoutCall( layoutCall, sizedParams );
+			addSTypeParamsToLayoutCall( layoutCall, sizedParams );
 
 			stmtsToAddBefore.emplace_back(
@@ -2336,5 +2327,5 @@
 			} );
 
-		addOTypeParamsToLayoutCall( layoutCall, sizedParams );
+		addSTypeParamsToLayoutCall( layoutCall, sizedParams );
 
 		stmtsToAddBefore.emplace_back(
@@ -2346,5 +2337,5 @@
 }
 
-void PolyGenericCalculator::addOTypeParamsToLayoutCall(
+void PolyGenericCalculator::addSTypeParamsToLayoutCall(
 		ast::UntypedExpr * layoutCall,
 		const ast::vector<ast::Type> & otypeParams ) {