v3. Don't shadow special vars in entry-point lambda lists. Improve
tests.