Minor refactor and beter coverage for pkg/stringid Upstream-commit: d2eb5dc9e0365ea4d50076011a7ef92d435b5032 Component: engine