Fixed comparison definition and comparator constness