Avoid repeated overwrites of config['extra_*']

Fixes #133