reduce Dict lookups

fixes #1627