Uint color marker index

Additional cleanup work to make output indexes uniformly uint.