Fixes to AutoRewrite for Lambda.