Bug 925622 - remove two pass string parsing. r=stas