eliminate use of String-case macro