Fix the context when iterating through dictionaries

[mjumbewu]

• Use item values instead of keys as local context
• Use items for iterating through dictionaries and enumerate when iterating through other iterables

[adambom]

I wish I had seen this before I submitted a similar PR. Your fix looks more robust so I'll use your fork.