Fixing things to work with the new (correctly-behaving) version of util.istype