Couldn't sleep tonight (sinus congestion), so decided to close a few makedev bugs. Well, I'm not sure 18 still counts as "a few", but...

This is more hacking on the current nasty codebase. I'd really like to cut over to the new table-driven version in experimental before sarge releases, but getting the tables right to match our current version still hasn't floated to the top of my "things I want to work on today" list. Sigh.