Extra fixes

Here are some more changes for you to pick through.

Note that the `defadvice` doesn't do anything in its current form, because it advises a non-existent function. Wasn't sure how to fix that. :-)

-Steve