Done.  Please see changeset c291d22.