Can you guys move the constants you added down into the STR_ section and prefix them with STR_?