use new Em.Map function signatures

still have two failing tests, and this will also break the stable builds...