Repair mismatch of wide character macro with string definition.
Get character macros in place.
Fix spacing.