Work on fixing the autogen build.