Take account of arguments in rabbit_topic_trie_binding.
Merge bug 25991