Fix some more type demangle on FreeBSD