Clean up some facet selection checks.