More simplification of the code.
Fix shadows of config.