Track the Closure runtime class

Also cleaned up some of the other runtime code