ENH: Minor speedup