More diff cleanup.