This patch fixes profiling at the cost of losing cost centre accounting in a
very small number of cases. I am working on a better fix.