More non-dane wording changes.  A good compromise?