Merge pull request #551 from schu/treebuilder-entries treebuilder: remove needless variable entry_count