[dcs] Remove reduntant tests, lang-specific macros