Agreed, but I'll do that in a separate PR.