manually building enhanced .map to maintain arity with spec
manually building enhanced .map to maintain arity with spec


Former-commit-id: 660e0394fc1a9491d87b4491a364d6bf8a6b02c4 [formerly 2ec5f65f32c33a4a0b412df9292995b46aa20903]
Former-commit-id: 99303bb61579cce0ecf7555a624931eb4385fcfc
romancow/Sugar,romancow/Sugar,andrewplummer/Sugar,andrewplummer/Sugar