Small micro-optimization for datastructures
Merge pull request #357 from untitaker/sprint-branch

Small micro-optimization for datastructures