I'd prefer no flag, but given history - introducing that complication may make most sense.