Minor rearrangements in config.py