Fixed problems introduced earlier with cgi.escape.