Fix dependencies/scoping errors in config.pp.