More fixes for FreeBSD 10 / Clang 3.3.