Topic/dictionary indexing tweaks

I noticed some dead code in one of the rename functions, and figured I would send a PR rather than make a comment (and add changes for my other comments - which you can choose to ignore).