Agreed. We should not store operation-specific state in an OSH's fields.