Remove use of lexical-let