Bug 834449 - Part 3: simplify cleanup of cached statements. r=gps