Agree, but let's do that in another PR.