Add that for ECMA fix and remove obsolete context arguments