Rewrites the facet add/remove code to make it sane.