Changes are mainly portability mods; just one minor change for NetBSD to compile out of the box, which has been fed back upstream.