Upgrade comparison tool further

Needed to make #4468 go green.