FreeBSD clang didn't like some of the syntax, fixed.
Reverted the FreeBSD ASSERT_DEATH changes.