Cleaned up unquote handling in the parser somewhat.

[#58864040]