Fix #7 not working with closures in maps, and adding maps to maps