Further config_parse cleanup.