Another minor load-config cleanup.