Version 1 of #2216

As a reminder, at some point we will need to do some housekeeping because any criticisms of #2108 are probably also going to be criticisms #2109 and we want an intact criticism chain.

I’m marking this as a criticism so we don’t forget. And when we’re done with the housekeeping, we can say so in a counter-criticism to ‘check off’ that todo item.