Oops, I broke those old performance improvements. Fixing it.