More on replacing string literals with define macro constants.

Change-Id: I86446a21f042b2b80ab2523fc9df6a90eace3b4e