Yup i mentioned exactly that below, this is what i was thinking as well.

It does seem to add reasonable complexity to the implementations, but i imagine it's opt-in.