matching names. This commit might include some private hacks that have been lurking in my tree a while. They're all harmless, and this reduces the number of gratuitous diffs I have to deal with.
