Minor cleanup of diff