Is there any benefit to this change? count isn't used anywhere else. Ditto for L129