Agreed but out of scope of this PR.