Add support for report_safe option.