A whole bunch of changes to do facets properly: