change from uint1 to uindex_t and changed pre-processed handler to remove string comparisons