Further adaptations for using the new FilteredTriple