Revision 18181 reverts the change to plugins.c, which was checked in
unintentionally.

Also, I think this change was a little too aggressive in pushing
variables around to outer scope when they didn't need to be.  Working on
a revision.