Refactoring to match changes to go-bencode