diff --git a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
index f2aafa5671..253a38fd83 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/hql/internal/SemanticQueryBuilder.java
@@ -411,7 +411,7 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
 				? ParameterStyle.UNKNOWN
 				: ParameterStyle.MIXED;
 
-		final TypeConfiguration typeConfiguration = creationContext.getNodeBuilder().getTypeConfiguration();
+		final TypeConfiguration typeConfiguration = creationContext.getTypeConfiguration();
 		final JavaTypeRegistry javaTypeRegistry = typeConfiguration.getJavaTypeRegistry();
 		this.integerDomainType = typeConfiguration.standardBasicTypeForJavaType( Integer.class );
 		this.listJavaType = javaTypeRegistry.resolveDescriptor( List.class );
@@ -1436,7 +1436,7 @@ public class SemanticQueryBuilder<R> extends HqlParserBaseVisitor<Object> implem
 	public SqmSelectClause visitSelectClause(HqlParser.SelectClauseContext ctx) {
 		// todo (6.0) : primer a select-clause-specific SemanticPathPart into the stack
 		final SqmSelectClause selectClause =
-				new SqmSelectClause(ctx.DISTINCT() != null, creationContext.getNodeBuilder() );
+				new SqmSelectClause( ctx.DISTINCT() != null, creationContext.getNodeBuilder() );
 		final HqlParser.SelectionListContext selectionListContext = ctx.selectionList();
 		for ( HqlParser.SelectionContext selectionContext : selectionListContext.selection() ) {
 			selectClause.addSelection( visitSelection( selectionContext ) );
diff --git a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
index 555c6553d9..e0e91eb987 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/sqm/internal/SqmCriteriaNodeBuilder.java
@@ -202,7 +202,7 @@ import static org.hibernate.query.sqm.TrimSpec.fromCriteriaTrimSpec;
  *
  * @author Steve Ebersole
  */
-public class SqmCriteriaNodeBuilder implements NodeBuilder, SqmCreationContext, Serializable {
+public class SqmCriteriaNodeBuilder implements NodeBuilder, Serializable {
 
 	private static final CoreMessageLogger LOG = CoreLogging.messageLogger( SqmCriteriaNodeBuilder.class );