Rename lists/dicts to iterable/maps for clarity, and also rely on them more when processing other data structures