Use more explicit checks for the Illumos/FreeBSD trees.
Remove comment changes rejected upstream; diff reductions.

This is current as of SpectraBSD/stable@663881.