Added support for expandable strings.