This makes the build system a little simpler, and in particular
will make it easier to handle the changes needed for cross-compilation.