QuickBug: performance improvements.