Little efficiency tweak repeated a few thousand times
Strip off one html-from-fragment call
Merge pull request #395 from cmc333333/perf-misc

Performance Tweak 6: A few optimizations in frequent code