Be more consistent about config path usage