Clean up configure.ac as suggested by autoscan.
More configure.ac cleanup.