One more cleanup in configure.