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

Updated patch attached. The previous version choked on
lambda-expressions because I didn't take into account the side effects
of a test.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)

iEYEARECAAYFAk1F26gACgkQ17c2LVA10VvNYgCgsMDhZ4pEQn7GFdfTKk/H3THx
nFUAoIk1QCxaiokX3Ol25Vhj05Q7Vl4x
=mp5G
-----END PGP SIGNATURE-----