Various updates to calc.clj.