2014.7: misc dict usage cleanup

Fixing common suboptimal uses of dicts.