Happy with a separate PR or this one -- whichever seems easier.