Prepare for more complete istype handling.