Agreed (for a separate PR).