Code cleanup for autogen.sh