Also has bunches of cleanups, including string.h/strings.h ifdefs, whitespace, and removal of pointless comments.