Adjust comments to new semantics.