Converting Matrix-C to macros and adding two-matrix versions of EntrywiseMap and IndexDependentMap.