Fixup for c1fc91ed : Move strings to static variables