use new Em.Map function signatures

still have two failing tests, and this will also break the stable builds...
Can we do var i here? Kinda funky to have it declared 20 lines above?