updated grammar for a few remaining strings.  Removed unused rules.
factored out the untaint_str method so it can be used elsewhere.