Add WITH-CURRENT-CC-LEXENV