Make 1.6+ work with new instance format.