Fixed the string literals and extended them to include embedded
expressions.