NameTools hackery. I think I've fixed a few of the most egregious issues. Cross-linking seems to work better now, in any event.
Lots of assorted stuff off the todo list.