Fixed bug .3y284ob (HTML entities in Display Name)

Lots of persnickety work to make sure that HTML entities get encoded
exactly once as they go through the pipeline.  Still don't entirely love
this code, but it's much better.