Clean up
Apply with-arch patch on NetBSD and Linux only. Breaks SunOS otherwise.