Some changes to investigate a bug in Costanza's metric.