I'll do that as a separate PR.