No, Baker, Mattis is not comped.
If Mattis is to serve as a tribunal judge is need to appear to have had a falling-out with the President. Otherwise he would be called a Trump stooge. Trump needs to appear to be entirely unconnected to it for reasons of optics.