Rework of MPH for switch-supporting-string-constants