Fixes count call being called globally instead of on array.
Merge remote-tracking branch 'origin' into optimize_commenting