Little cleanups, and C-u variant for the lambda thing