configure.ac cleanups