Modernize the configuration a bit (for small values of modernize)
so avoid at least some obsolete macros.