Fix some performance issues with analyzer