Perform fewer dict lookups - tiny microoptimization
Merge pull request #35 from alex/less-dicts

Perform fewer dict lookups - tiny microoptimization