Switched to using modern subscript accesses to dictionaries and arrays wherever possible.