same theme here; I don't think these go inside of the report_format version check.