Address Spencer's PR comments

Changes integer base on capacity gossip keys and adds TODO
for possible speedup.