Consolidate FreeBSD versions with Linux versions.
Refactor for FreeBSD portability.