Various fixups to the internal autoconf system