Eliminates some globals from IPT_classes