Another incremental optimization.