Here is proposed diff: http://paste.pocoo.org/show/6990 I think it doesn't really crash anything (no tests failing), nor has any performance impact, but who knows... I would like someone to review that patch. Basically, half of the time spend in inline helpers is spend in cleanup_graph, which imho can be performed less often. Cheers, fijal :.