Bug 870317: do not try to escape unicode, move to simpler numeric entities

With the negative lookahead for the amperand matching, do not need the ENTITIES hack, and moved to simpler scheme of just using charcode and numeric # entities for the lower, problematic characters.