Update comments to reflect the KVO merge.