Going to that in a separate PR, otherwise we have a chicken-and-egg problem in merging.