Only minimal changes needed. This was done to satisfy darko-poljak's request here: https://github.com/ungleich/cdist/pull/354#issuecomment-263492801