Though I'm pretty sure this covers the second rewrite situation.  I might change ours to do the same.