This seems to give about 10% performance improvements in some calc cell
calculations.

Change-Id: Ibd91558b3c107e4c8e1401345c9332f97645453e