More cleanup of outwards-facing API, preparing for UI updates in the future, preparing for per-facet overrides