More configure.ac cleanup