Re: modification to allow -Wcast-qual to find potential warnings without unicode.h causing them