-> Clean up the use of autoconf macros a bit.