More configure.ac cleanup.