Another small speed improvement