I think we should do that, yes, given how much we are otherwise trying to embody the semantics in the types.