Changes to handle <string-name> and other bugs.