diff --git a/engine/src/main/java/org/hibernate/search/engine/search/sort/dsl/impl/FieldSortOptionsStepImpl.java b/engine/src/main/java/org/hibernate/search/engine/search/sort/dsl/impl/FieldSortOptionsStepImpl.java
index 94adeca275a..899d220ed42 100644
--- a/engine/src/main/java/org/hibernate/search/engine/search/sort/dsl/impl/FieldSortOptionsStepImpl.java
+++ b/engine/src/main/java/org/hibernate/search/engine/search/sort/dsl/impl/FieldSortOptionsStepImpl.java
@@ -24,7 +24,7 @@
 class FieldSortOptionsStepImpl<B>
 		extends AbstractSortThenStep<B>
 		implements FieldSortOptionsStep<FieldSortOptionsStepImpl<B>>,
-	FieldSortMissingValueBehaviorStep<FieldSortOptionsStepImpl<B>> {
+				FieldSortMissingValueBehaviorStep<FieldSortOptionsStepImpl<B>> {
 
 	private final FieldSortBuilder<B> builder;
 
@@ -53,10 +53,8 @@ public FieldSortMissingValueBehaviorStep<FieldSortOptionsStepImpl<B>> missing()
 
 	@Override
 	public FieldSortOptionsStepImpl<B> filter(
-		Function<? super SearchPredicateFactory, ? extends PredicateFinalStep> clauseContributor) {
-
-		SearchSortDslContext<?, ? super B> ctx = getDslContext();
-		SearchPredicateBuilderFactory predicateBuilderFactory = ctx.getPredicateBuilderFactory();
+			Function<? super SearchPredicateFactory, ? extends PredicateFinalStep> clauseContributor) {
+		SearchPredicateBuilderFactory<?, ?> predicateBuilderFactory = getDslContext().getPredicateBuilderFactory();
 		SearchPredicateFactory factory = new DefaultSearchPredicateFactory<>( predicateBuilderFactory );
 		SearchPredicate predicate = clauseContributor.apply( extendPredicateFactory( factory ) ).toPredicate();
 
@@ -66,8 +64,7 @@ public FieldSortOptionsStepImpl<B> filter(
 
 	@Override
 	public FieldSortOptionsStepImpl<B> filter(SearchPredicate searchPredicate) {
-		SearchSortDslContext<?, ? super B> ctx = getDslContext();
-		SearchPredicateBuilderFactory predicateBuilderFactory = ctx.getPredicateBuilderFactory();
+		SearchPredicateBuilderFactory<?, ?> predicateBuilderFactory = getDslContext().getPredicateBuilderFactory();
 		searchPredicate = (SearchPredicate) predicateBuilderFactory.toImplementation( searchPredicate );
 
 		builder.filter( searchPredicate );