Update CHM2 to use Doug's instanceof check