some fixes in terms of map

Mainly, make a intermediate function to get the keys we want. 
The idea was that you'd change "midOfAddBuiltin" to "addBuiltin," not "addBuiltins" to "addBuiltin." Sorry that wasn't clear.