Older versions of gcc were unhappy with our previous trick, and
just separating out the __CHECKER__ case made it much simpler.