More diff massaging.