Bug 855276: Diagnostic patch. r=bent
Bug 857669: Remove unused traversal method. r=mounir