I agree. I thought the same but wondering if it should be part of another change. I think it makes sense to have it in this PR. Going to update.