Fixed another unnecessary escaping. More tests.