Rearranged slightly (_cstr variants always come first in header/source now)