Fix consistency of FacetFactory interface