Correct some instances of emitting empty string tokens when parsing
double-quoted strings.  Also cleaned up some indentation issues and
added type signatures.