*Sigh.* This is getting out of hand. (Not a criticism of this PR, but we’ll need to get rid of these traits somehow.)