Slight refactor in prep for keyable topics.