Remaining FreeBSD 10 clean up.