ACalc code cleanup.