Const cleanup...should only be 2 warnings left from calling lib/util_str.c