Move around entries to match gdalinfo, and add ICHIP support