Ooooh! Love the idea of an all-purpose Codex! I've done that, too. Bernard Addison was originally created in "The Dream", and then he just seemed like the perfect character to appear in "Deja Vu". By now, he and Giles have renewed their friendship and he's developed a relationship with Willow, so he may appear in future stories.