Convert two more Parser uses, no parser test failures. Any more conversions look...

Convert two more Parser uses, no parser test failures.  Any more conversions look like they'll have to get the parser to use arrays for query strings instead of storing them as strings.