Index: src/GenPoly/Box.cpp
===================================================================
--- src/GenPoly/Box.cpp	(revision 82a5ea23df09d8e6900e45f3b0d081bad576c253)
+++ src/GenPoly/Box.cpp	(revision b6f2e7abcc170946c8758bcf25e0848b57d5f213)
@@ -1925,6 +1925,5 @@
 ast::Expr const * PolyGenericCalculator::postvisit(
 		ast::SizeofExpr const * expr ) {
-	ast::Type const * type = expr->type ? expr->type : expr->expr->result;
-	ast::Expr const * gen = genSizeof( expr->location, type );
+	ast::Expr const * gen = genSizeof( expr->location, expr->type );
 	return ( gen ) ? gen : expr;
 }
@@ -1932,6 +1931,5 @@
 ast::Expr const * PolyGenericCalculator::postvisit(
 		ast::AlignofExpr const * expr ) {
-	ast::Type const * type = expr->type ? expr->type : expr->expr->result;
-	ast::Expr const * gen = genAlignof( expr->location, type );
+	ast::Expr const * gen = genAlignof( expr->location, expr->type );
 	return ( gen ) ? gen : expr;
 }
Index: src/GenPoly/GenPoly.cpp
===================================================================
--- src/GenPoly/GenPoly.cpp	(revision 82a5ea23df09d8e6900e45f3b0d081bad576c253)
+++ src/GenPoly/GenPoly.cpp	(revision b6f2e7abcc170946c8758bcf25e0848b57d5f213)
@@ -299,7 +299,6 @@
 		ast::SizeofExpr const * r = as<ast::SizeofExpr>(rhs);
 
-		assert((l->type != nullptr) ^ (l->expr != nullptr));
-		assert((r->type != nullptr) ^ (r->expr != nullptr));
-		if ( !(l->type && r->type) ) return false;
+		assert( l->type );
+		assert( r->type );
 
 		// mutual recursion with type poly compatibility
Index: src/GenPoly/Lvalue.cpp
===================================================================
--- src/GenPoly/Lvalue.cpp	(revision 82a5ea23df09d8e6900e45f3b0d081bad576c253)
+++ src/GenPoly/Lvalue.cpp	(revision b6f2e7abcc170946c8758bcf25e0848b57d5f213)
@@ -607,5 +607,4 @@
 ast::SizeofExpr const * ReferenceTypeElimination::previsit(
 		ast::SizeofExpr const * expr ) {
-	if ( expr->expr ) return expr;
 	return ast::mutate_field( expr, &ast::SizeofExpr::type,
 		expr->type->stripReferences() );
@@ -614,5 +613,4 @@
 ast::AlignofExpr const * ReferenceTypeElimination::previsit(
 		ast::AlignofExpr const * expr ) {
-	if ( expr->expr ) return expr;
 	return ast::mutate_field( expr, &ast::AlignofExpr::type,
 		expr->type->stripReferences() );