Gotcha. We should strive for that, even if in another PR.