replace a few `let*`s with `let`s
Merge branch 'master' into extract-defn
improve feature test for extract-defn