Do you want to do that as part of this PR, or should we file a separate issue?