Various cleanup, move Class to a scope local
Move Importer to be a scope local
Add lambdas and argument promotion to closures
Add self promotion into closures