Fix some build breaks when compiling for Unicode.
Authored by: david_costanzo 2019-05-29
Parent: [r4937]
Child: [r4939]