Add mapping to make 'cxx' work linewise