Use less obtrusive comments to make it easier to diff in the future.