Comment 5 for bug 940139

You branch looks quite complicated. Also, my profiling told me that only about 40% of that 51% (=20%) was the decor plugin. But still the biggest single contributor from memory.

My fixes are much smaller and simpler, and will be guided by the profiler results and call graphs (which I haven't attached). Still need to refine and test my fixes. Another day.