Minor speedups.