Clean up config value referencing.