looks good to me; r=stephend, if you'll allow that.  I could also merge :-)