Some further optimization.