Further minor speedup