Some configure-related decrufting.