Close GH-3: switch to es.map.