Add proper support for identifiers and quoted strings.