Add marco.core.map.
Reformat marco.core.