Oops, missed a macro definition spot
Small generator fix for invalid UTF-8