I was sloppy when distinguishing local macros and local functions; the
new patch addresses this.  Also, lost comment about lexical-let is back.