Type accuracy. Minor optimization.