John,

I think I misspoke (or miswrote).  The change I suggested would belong in 
both versions.