More separation of FreeBSD vs. non-FreeBSD.