Sure, but not as part of this PR. ;-)