Inline the string constants again.

This actually isn't too bad, if I may say so myself.