I think we could safely do this in all cases, rather than only in non-deprecated mode. Then you could get rid of the `compat` field, too!