- changed convertEnum and appropriate maps to use token constants (rahter than sal_Char*)
- user index marks in the process