Match FreeBSD tweaks on 1.4-master.