autogen.sh: less is more, tidy up