[MERGE] Fix out-of-date error, refactor slightly

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:
> Aaron, did you just commit the cardinal sin of sending a plain [MERGE]
> request for a plugin?

Mea culpa.  You get the dolphins and the maple syrup, I'll get the
hockey stick and the turtle wax.  Just be gentle, please.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIELXX0F+nu1YWqI0RAhPlAJ9PB+iXOIe4FKkGiCn3YQHF9DhBvACfSQAK
Kgh/oqOUvMzHsUE7LDm3imk=
=IYDH
-----END PGP SIGNATURE-----