Update upstream iterator method names in codegen.
Updates for upstream closure reform.
Stop using std::cell (no longer necessary).